From dcfd354b8a96c01ab20f6043884caa134def1d09 Mon Sep 17 00:00:00 2001 From: Josh Lane Date: Fri, 2 Jan 2015 09:34:40 -0800 Subject: [PATCH] working tests --- .travis.yml | 47 +++++++ Rakefile | 6 + gemfiles/Gemfile-edge | 14 +++ gemfiles/Gemfile-ruby-1.8.7 | 17 +++ lib/fog/aws.rb | 119 ++++++++++++++++++ lib/fog/aws/auto_scaling.rb | 4 +- lib/fog/aws/beanstalk.rb | 2 +- lib/fog/aws/cdn.rb | 4 +- lib/fog/aws/cloud_formation.rb | 2 +- lib/fog/aws/cloud_watch.rb | 4 +- lib/fog/aws/compute.rb | 4 +- lib/fog/aws/core.rb | 4 +- lib/fog/aws/data_pipeline.rb | 2 +- lib/fog/aws/dns.rb | 4 +- lib/fog/aws/elb.rb | 2 +- lib/fog/aws/emr.rb | 2 +- lib/fog/aws/glacier.rb | 2 +- lib/fog/aws/iam.rb | 2 +- lib/fog/aws/models/beanstalk/templates.rb | 2 +- lib/fog/aws/models/cdn/distribution.rb | 2 +- lib/fog/aws/models/cdn/distribution_helper.rb | 2 +- lib/fog/aws/models/cdn/distributions.rb | 2 +- .../aws/models/cdn/distributions_helper.rb | 2 +- lib/fog/aws/models/cdn/invalidation.rb | 2 +- lib/fog/aws/models/cdn/invalidations.rb | 2 +- .../aws/models/cdn/streaming_distribution.rb | 2 +- .../aws/models/cdn/streaming_distributions.rb | 2 +- lib/fog/aws/models/cloud_watch/alarm.rb | 2 +- lib/fog/aws/models/compute/address.rb | 2 +- lib/fog/aws/models/compute/addresses.rb | 12 +- lib/fog/aws/models/compute/dhcp_option.rb | 4 +- lib/fog/aws/models/compute/dhcp_options.rb | 14 +-- lib/fog/aws/models/compute/flavor.rb | 2 +- lib/fog/aws/models/compute/flavors.rb | 10 +- lib/fog/aws/models/compute/image.rb | 2 +- lib/fog/aws/models/compute/images.rb | 6 +- .../aws/models/compute/internet_gateway.rb | 4 +- .../aws/models/compute/internet_gateways.rb | 14 +-- lib/fog/aws/models/compute/key_pair.rb | 2 +- lib/fog/aws/models/compute/key_pairs.rb | 14 +-- lib/fog/aws/models/compute/network_acl.rb | 4 +- lib/fog/aws/models/compute/network_acls.rb | 12 +- .../aws/models/compute/network_interface.rb | 4 +- .../aws/models/compute/network_interfaces.rb | 14 +-- lib/fog/aws/models/compute/route_table.rb | 2 +- lib/fog/aws/models/compute/route_tables.rb | 14 +-- lib/fog/aws/models/compute/security_group.rb | 14 +-- lib/fog/aws/models/compute/security_groups.rb | 18 +-- lib/fog/aws/models/compute/server.rb | 2 +- lib/fog/aws/models/compute/servers.rb | 20 +-- lib/fog/aws/models/compute/snapshot.rb | 2 +- lib/fog/aws/models/compute/snapshots.rb | 2 +- lib/fog/aws/models/compute/spot_request.rb | 2 +- lib/fog/aws/models/compute/spot_requests.rb | 2 +- lib/fog/aws/models/compute/subnet.rb | 4 +- lib/fog/aws/models/compute/subnets.rb | 14 +-- lib/fog/aws/models/compute/tag.rb | 2 +- lib/fog/aws/models/compute/tags.rb | 2 +- lib/fog/aws/models/compute/volume.rb | 2 +- lib/fog/aws/models/compute/volumes.rb | 16 +-- lib/fog/aws/models/compute/vpc.rb | 4 +- lib/fog/aws/models/compute/vpcs.rb | 14 +-- lib/fog/aws/models/dns/record.rb | 2 +- lib/fog/aws/models/dns/records.rb | 4 +- lib/fog/aws/models/dns/zone.rb | 2 +- lib/fog/aws/models/dns/zones.rb | 2 +- lib/fog/aws/models/iam/access_keys.rb | 2 +- lib/fog/aws/models/iam/policies.rb | 2 +- lib/fog/aws/models/storage/directories.rb | 2 +- lib/fog/aws/models/storage/directory.rb | 2 +- lib/fog/aws/models/storage/file.rb | 6 +- lib/fog/aws/models/storage/files.rb | 2 +- lib/fog/aws/models/storage/version.rb | 2 +- lib/fog/aws/models/storage/versions.rb | 2 +- lib/fog/aws/parsers/elb/tag_list_parser.rb | 2 +- lib/fog/aws/parsers/rds/tag_list_parser.rb | 2 +- lib/fog/aws/rds.rb | 2 +- lib/fog/aws/redshift.rb | 2 +- .../auto_scaling/create_auto_scaling_group.rb | 6 +- .../create_launch_configuration.rb | 2 +- .../describe_auto_scaling_groups.rb | 2 +- .../describe_auto_scaling_instances.rb | 2 +- .../describe_launch_configurations.rb | 2 +- .../describe_notification_configurations.rb | 2 +- .../auto_scaling/describe_policies.rb | 2 +- .../describe_scaling_activities.rb | 2 +- .../describe_scheduled_actions.rb | 2 +- .../disable_metrics_collection.rb | 2 +- .../auto_scaling/enable_metrics_collection.rb | 2 +- .../put_notification_configuration.rb | 2 +- .../requests/auto_scaling/resume_processes.rb | 2 +- .../auto_scaling/suspend_processes.rb | 2 +- .../auto_scaling/update_auto_scaling_group.rb | 4 +- .../create_configuration_template.rb | 10 +- .../requests/beanstalk/create_environment.rb | 12 +- .../describe_application_versions.rb | 4 +- .../beanstalk/describe_applications.rb | 4 +- .../describe_configuration_options.rb | 2 +- .../describe_environment_resources.rb | 2 +- .../beanstalk/describe_environments.rb | 6 +- .../aws/requests/beanstalk/describe_events.rb | 2 +- .../requests/beanstalk/rebuild_environment.rb | 2 +- .../beanstalk/request_environment_info.rb | 2 +- .../requests/beanstalk/restart_app_server.rb | 2 +- .../beanstalk/retrieve_environment_info.rb | 2 +- .../beanstalk/terminate_environment.rb | 2 +- .../update_configuration_template.rb | 6 +- .../requests/beanstalk/update_environment.rb | 6 +- .../validate_configuration_settings.rb | 4 +- .../aws/requests/cdn/delete_distribution.rb | 2 +- .../cdn/delete_streaming_distribution.rb | 2 +- lib/fog/aws/requests/cdn/get_distribution.rb | 2 +- .../aws/requests/cdn/get_distribution_list.rb | 2 +- lib/fog/aws/requests/cdn/get_invalidation.rb | 2 +- .../aws/requests/cdn/get_invalidation_list.rb | 2 +- .../cdn/get_streaming_distribution.rb | 2 +- .../cdn/get_streaming_distribution_list.rb | 2 +- lib/fog/aws/requests/cdn/post_distribution.rb | 4 +- lib/fog/aws/requests/cdn/post_invalidation.rb | 2 +- .../cdn/post_streaming_distribution.rb | 2 +- .../requests/cdn/put_distribution_config.rb | 4 +- .../cdn/put_streaming_distribution_config.rb | 2 +- .../requests/cloud_formation/create_stack.rb | 2 +- .../requests/cloud_formation/delete_stack.rb | 2 +- .../cloud_formation/describe_stack_events.rb | 2 +- .../describe_stack_resources.rb | 2 +- .../cloud_formation/describe_stacks.rb | 2 +- .../requests/cloud_formation/get_template.rb | 2 +- .../cloud_formation/list_stack_resources.rb | 2 +- .../requests/cloud_formation/list_stacks.rb | 2 +- .../requests/cloud_formation/update_stack.rb | 2 +- .../cloud_formation/validate_template.rb | 2 +- .../aws/requests/cloud_watch/delete_alarms.rb | 2 +- .../requests/cloud_watch/describe_alarms.rb | 2 +- .../cloud_watch/describe_alarms_for_metric.rb | 4 +- .../cloud_watch/disable_alarm_actions.rb | 2 +- .../cloud_watch/enable_alarm_actions.rb | 2 +- .../cloud_watch/get_metric_statistics.rb | 6 +- .../aws/requests/cloud_watch/list_metrics.rb | 4 +- .../requests/cloud_watch/put_metric_alarm.rb | 10 +- .../requests/cloud_watch/put_metric_data.rb | 6 +- .../aws/requests/compute/allocate_address.rb | 4 +- .../compute/assign_private_ip_addresses.rb | 4 +- .../aws/requests/compute/associate_address.rb | 4 +- .../compute/associate_dhcp_options.rb | 4 +- .../requests/compute/associate_route_table.rb | 4 +- .../compute/attach_internet_gateway.rb | 4 +- .../compute/attach_network_interface.rb | 4 +- lib/fog/aws/requests/compute/attach_volume.rb | 4 +- .../authorize_security_group_ingress.rb | 4 +- .../compute/cancel_spot_instance_requests.rb | 4 +- lib/fog/aws/requests/compute/copy_image.rb | 8 +- lib/fog/aws/requests/compute/copy_snapshot.rb | 6 +- .../requests/compute/create_dhcp_options.rb | 4 +- lib/fog/aws/requests/compute/create_image.rb | 6 +- .../compute/create_internet_gateway.rb | 4 +- .../aws/requests/compute/create_key_pair.rb | 4 +- .../requests/compute/create_network_acl.rb | 4 +- .../compute/create_network_acl_entry.rb | 4 +- .../compute/create_network_interface.rb | 4 +- .../compute/create_placement_group.rb | 4 +- lib/fog/aws/requests/compute/create_route.rb | 4 +- .../requests/compute/create_route_table.rb | 4 +- .../requests/compute/create_security_group.rb | 4 +- .../aws/requests/compute/create_snapshot.rb | 6 +- .../create_spot_datafeed_subscription.rb | 6 +- lib/fog/aws/requests/compute/create_subnet.rb | 6 +- lib/fog/aws/requests/compute/create_tags.rb | 4 +- lib/fog/aws/requests/compute/create_volume.rb | 4 +- lib/fog/aws/requests/compute/create_vpc.rb | 6 +- .../requests/compute/delete_dhcp_options.rb | 4 +- .../compute/delete_internet_gateway.rb | 6 +- .../aws/requests/compute/delete_key_pair.rb | 4 +- .../requests/compute/delete_network_acl.rb | 4 +- .../compute/delete_network_acl_entry.rb | 4 +- .../compute/delete_network_interface.rb | 4 +- .../compute/delete_placement_group.rb | 4 +- lib/fog/aws/requests/compute/delete_route.rb | 4 +- .../requests/compute/delete_route_table.rb | 4 +- .../requests/compute/delete_security_group.rb | 4 +- .../aws/requests/compute/delete_snapshot.rb | 4 +- .../delete_spot_datafeed_subscription.rb | 4 +- lib/fog/aws/requests/compute/delete_subnet.rb | 4 +- lib/fog/aws/requests/compute/delete_tags.rb | 4 +- lib/fog/aws/requests/compute/delete_volume.rb | 4 +- lib/fog/aws/requests/compute/delete_vpc.rb | 4 +- .../aws/requests/compute/deregister_image.rb | 4 +- .../compute/describe_account_attributes.rb | 4 +- .../requests/compute/describe_addresses.rb | 4 +- .../compute/describe_availability_zones.rb | 4 +- .../requests/compute/describe_dhcp_options.rb | 4 +- .../aws/requests/compute/describe_images.rb | 4 +- .../compute/describe_instance_status.rb | 4 +- .../requests/compute/describe_instances.rb | 6 +- .../compute/describe_internet_gateways.rb | 4 +- .../requests/compute/describe_key_pairs.rb | 4 +- .../requests/compute/describe_network_acls.rb | 4 +- .../describe_network_interface_attribute.rb | 4 +- .../compute/describe_network_interfaces.rb | 4 +- .../compute/describe_placement_groups.rb | 4 +- .../aws/requests/compute/describe_regions.rb | 4 +- .../compute/describe_reserved_instances.rb | 4 +- .../describe_reserved_instances_offerings.rb | 4 +- .../requests/compute/describe_route_tables.rb | 4 +- .../compute/describe_security_groups.rb | 8 +- .../requests/compute/describe_snapshots.rb | 4 +- .../describe_spot_datafeed_subscription.rb | 6 +- .../describe_spot_instance_requests.rb | 4 +- .../compute/describe_spot_price_history.rb | 4 +- .../aws/requests/compute/describe_subnets.rb | 4 +- lib/fog/aws/requests/compute/describe_tags.rb | 4 +- .../compute/describe_volume_status.rb | 4 +- .../aws/requests/compute/describe_volumes.rb | 4 +- .../compute/describe_vpc_attribute.rb | 4 +- lib/fog/aws/requests/compute/describe_vpcs.rb | 4 +- .../compute/detach_internet_gateway.rb | 4 +- .../compute/detach_network_interface.rb | 4 +- lib/fog/aws/requests/compute/detach_volume.rb | 4 +- .../requests/compute/disassociate_address.rb | 4 +- .../compute/disassociate_route_table.rb | 4 +- .../requests/compute/get_console_output.rb | 4 +- .../aws/requests/compute/get_password_data.rb | 6 +- .../aws/requests/compute/import_key_pair.rb | 4 +- .../compute/modify_image_attribute.rb | 4 +- .../compute/modify_instance_attribute.rb | 4 +- .../modify_network_interface_attribute.rb | 4 +- .../compute/modify_snapshot_attribute.rb | 4 +- .../compute/modify_subnet_attribute.rb | 4 +- .../compute/modify_volume_attribute.rb | 4 +- .../requests/compute/modify_vpc_attribute.rb | 4 +- .../aws/requests/compute/monitor_instances.rb | 8 +- .../purchase_reserved_instances_offering.rb | 4 +- .../aws/requests/compute/reboot_instances.rb | 4 +- .../aws/requests/compute/register_image.rb | 4 +- .../aws/requests/compute/release_address.rb | 4 +- .../replace_network_acl_association.rb | 4 +- .../compute/replace_network_acl_entry.rb | 4 +- lib/fog/aws/requests/compute/replace_route.rb | 4 +- .../compute/request_spot_instances.rb | 4 +- .../reset_network_interface_attribute.rb | 4 +- .../compute/revoke_security_group_ingress.rb | 4 +- lib/fog/aws/requests/compute/run_instances.rb | 4 +- .../aws/requests/compute/start_instances.rb | 4 +- .../aws/requests/compute/stop_instances.rb | 4 +- .../requests/compute/terminate_instances.rb | 4 +- .../requests/compute/unmonitor_instances.rb | 8 +- .../dns/change_resource_record_sets.rb | 6 +- .../aws/requests/dns/create_health_check.rb | 2 +- .../aws/requests/dns/create_hosted_zone.rb | 2 +- .../aws/requests/dns/delete_health_check.rb | 2 +- .../aws/requests/dns/delete_hosted_zone.rb | 4 +- lib/fog/aws/requests/dns/get_change.rb | 4 +- lib/fog/aws/requests/dns/get_health_check.rb | 2 +- lib/fog/aws/requests/dns/get_hosted_zone.rb | 4 +- .../aws/requests/dns/list_health_checks.rb | 4 +- lib/fog/aws/requests/dns/list_hosted_zones.rb | 2 +- .../requests/dns/list_resource_record_sets.rb | 4 +- .../authorize_cache_security_group_ingress.rb | 2 +- .../revoke_cache_security_group_ingress.rb | 2 +- .../aws/requests/elb/create_load_balancer.rb | 2 +- .../elb/create_load_balancer_policy.rb | 2 +- .../glacier/abort_multipart_upload.rb | 2 +- .../glacier/complete_multipart_upload.rb | 2 +- .../aws/requests/glacier/create_archive.rb | 2 +- lib/fog/aws/requests/glacier/create_vault.rb | 4 +- .../aws/requests/glacier/delete_archive.rb | 2 +- lib/fog/aws/requests/glacier/delete_vault.rb | 2 +- ...delete_vault_notification_configuration.rb | 2 +- lib/fog/aws/requests/glacier/describe_job.rb | 2 +- .../aws/requests/glacier/describe_vault.rb | 2 +- .../aws/requests/glacier/get_job_output.rb | 2 +- .../get_vault_notification_configuration.rb | 2 +- lib/fog/aws/requests/glacier/initiate_job.rb | 2 +- .../glacier/initiate_multipart_upload.rb | 2 +- lib/fog/aws/requests/glacier/list_jobs.rb | 2 +- .../glacier/list_multipart_uploads.rb | 2 +- lib/fog/aws/requests/glacier/list_parts.rb | 2 +- lib/fog/aws/requests/glacier/list_vaults.rb | 2 +- .../set_vault_notification_configuration.rb | 2 +- lib/fog/aws/requests/glacier/upload_part.rb | 2 +- lib/fog/aws/requests/iam/create_access_key.rb | 2 +- lib/fog/aws/requests/iam/create_role.rb | 2 +- .../aws/requests/iam/get_account_summary.rb | 20 +-- .../requests/iam/upload_server_certificate.rb | 2 +- .../authorize_db_security_group_ingress.rb | 2 +- .../rds/revoke_db_security_group_ingress.rb | 2 +- ...uthorize_cluster_security_group_ingress.rb | 4 +- .../redshift/authorize_snapshot_access.rb | 2 +- .../redshift/copy_cluster_snapshot.rb | 2 +- .../aws/requests/redshift/create_cluster.rb | 2 +- .../create_cluster_parameter_group.rb | 4 +- .../redshift/create_cluster_snapshot.rb | 2 +- .../redshift/create_cluster_subnet_group.rb | 2 +- .../aws/requests/redshift/delete_cluster.rb | 2 +- .../redshift/delete_cluster_snapshot.rb | 2 +- .../redshift/delete_cluster_subnet_group.rb | 2 +- .../redshift/describe_cluster_snapshots.rb | 4 +- .../aws/requests/redshift/describe_resize.rb | 2 +- .../aws/requests/redshift/modify_cluster.rb | 2 +- .../redshift/modify_cluster_subnet_group.rb | 2 +- .../aws/requests/redshift/reboot_cluster.rb | 2 +- .../redshift/restore_from_cluster_snapshot.rb | 4 +- .../revoke_cluster_security_group_ingress.rb | 4 +- .../redshift/revoke_snapshot_access.rb | 2 +- lib/fog/aws/requests/sns/create_topic.rb | 2 +- lib/fog/aws/requests/sns/subscribe.rb | 25 ---- .../requests/sqs/change_message_visibility.rb | 2 +- lib/fog/aws/requests/sqs/create_queue.rb | 2 +- lib/fog/aws/requests/sqs/delete_message.rb | 2 +- lib/fog/aws/requests/sqs/delete_queue.rb | 2 +- .../aws/requests/sqs/get_queue_attributes.rb | 2 +- lib/fog/aws/requests/sqs/list_queues.rb | 2 +- lib/fog/aws/requests/sqs/receive_message.rb | 2 +- lib/fog/aws/requests/sqs/send_message.rb | 2 +- .../aws/requests/sqs/set_queue_attributes.rb | 2 +- .../storage/abort_multipart_upload.rb | 4 +- lib/fog/aws/requests/storage/acl_utils.rb | 2 +- .../storage/complete_multipart_upload.rb | 4 +- lib/fog/aws/requests/storage/copy_object.rb | 2 +- lib/fog/aws/requests/storage/cors_utils.rb | 2 +- lib/fog/aws/requests/storage/delete_bucket.rb | 2 +- .../requests/storage/delete_bucket_cors.rb | 2 +- .../storage/delete_bucket_lifecycle.rb | 2 +- .../requests/storage/delete_bucket_policy.rb | 2 +- .../requests/storage/delete_bucket_tagging.rb | 2 +- .../requests/storage/delete_bucket_website.rb | 2 +- .../storage/delete_multiple_objects.rb | 2 +- lib/fog/aws/requests/storage/delete_object.rb | 2 +- lib/fog/aws/requests/storage/get_bucket.rb | 2 +- .../aws/requests/storage/get_bucket_acl.rb | 2 +- .../aws/requests/storage/get_bucket_cors.rb | 2 +- .../requests/storage/get_bucket_lifecycle.rb | 2 +- .../requests/storage/get_bucket_location.rb | 2 +- .../requests/storage/get_bucket_logging.rb | 2 +- .../storage/get_bucket_object_versions.rb | 2 +- .../aws/requests/storage/get_bucket_policy.rb | 2 +- .../requests/storage/get_bucket_tagging.rb | 2 +- .../requests/storage/get_bucket_versioning.rb | 2 +- .../requests/storage/get_bucket_website.rb | 2 +- lib/fog/aws/requests/storage/get_object.rb | 4 +- .../aws/requests/storage/get_object_acl.rb | 2 +- .../requests/storage/get_object_http_url.rb | 2 +- .../requests/storage/get_object_https_url.rb | 2 +- .../requests/storage/get_object_torrent.rb | 2 +- .../aws/requests/storage/get_object_url.rb | 2 +- .../requests/storage/get_request_payment.rb | 2 +- lib/fog/aws/requests/storage/get_service.rb | 2 +- lib/fog/aws/requests/storage/head_bucket.rb | 2 +- lib/fog/aws/requests/storage/head_object.rb | 2 +- .../storage/initiate_multipart_upload.rb | 4 +- .../storage/list_multipart_uploads.rb | 2 +- lib/fog/aws/requests/storage/list_parts.rb | 2 +- .../storage/post_object_hidden_fields.rb | 2 +- .../requests/storage/post_object_restore.rb | 2 +- lib/fog/aws/requests/storage/put_bucket.rb | 2 +- .../aws/requests/storage/put_bucket_acl.rb | 2 +- .../aws/requests/storage/put_bucket_cors.rb | 2 +- .../requests/storage/put_bucket_lifecycle.rb | 2 +- .../requests/storage/put_bucket_logging.rb | 2 +- .../aws/requests/storage/put_bucket_policy.rb | 2 +- .../requests/storage/put_bucket_tagging.rb | 2 +- .../requests/storage/put_bucket_versioning.rb | 2 +- .../requests/storage/put_bucket_website.rb | 2 +- lib/fog/aws/requests/storage/put_object.rb | 2 +- .../aws/requests/storage/put_object_acl.rb | 2 +- .../aws/requests/storage/put_object_url.rb | 2 +- .../requests/storage/put_request_payment.rb | 2 +- .../requests/storage/shared_mock_methods.rb | 2 +- lib/fog/aws/requests/storage/sync_clock.rb | 4 +- lib/fog/aws/requests/storage/upload_part.rb | 4 +- lib/fog/aws/requests/sts/assume_role.rb | 6 +- .../aws/requests/sts/assume_role_with_saml.rb | 6 +- lib/fog/aws/ses.rb | 8 +- lib/fog/aws/signaturev4.rb | 4 +- lib/fog/aws/sns.rb | 8 +- lib/fog/aws/sqs.rb | 4 +- lib/fog/aws/storage.rb | 20 +-- lib/fog/aws/sts.rb | 2 +- tests/credentials_tests.rb | 2 +- tests/lorem.txt | 1 + tests/models/auto_scaling/activities_tests.rb | 2 +- .../models/auto_scaling/configuration_test.rb | 2 +- .../auto_scaling/configurations_tests.rb | 2 +- tests/models/auto_scaling/groups_test.rb | 2 +- tests/models/auto_scaling/instances_tests.rb | 2 +- tests/models/beanstalk/version_tests.rb | 4 +- tests/models/cloud_watch/alarm_data_tests.rb | 4 +- .../models/cloud_watch/alarm_history_tests.rb | 2 +- .../cloud_watch/metric_statistics_tests.rb | 4 +- tests/models/cloud_watch/metrics_tests.rb | 4 +- tests/models/data_pipeline/pipeline_tests.rb | 2 +- tests/models/data_pipeline/pipelines_tests.rb | 2 +- tests/models/elasticache/cluster_tests.rb | 10 +- .../elasticache/parameter_groups_tests.rb | 6 +- .../elasticache/security_groups_tests.rb | 8 +- .../models/elasticache/subnet_groups_tests.rb | 6 +- tests/models/elb/model_tests.rb | 20 +-- tests/models/elb/tagging_tests.rb | 2 +- tests/models/glacier/model_tests.rb | 2 +- tests/models/rds/event_subscription_tests.rb | 2 +- tests/models/rds/event_subscriptions_tests.rb | 2 +- tests/models/rds/instance_option_tests.rb | 2 +- tests/models/rds/parameter_group_tests.rb | 2 +- tests/models/rds/parameter_groups_tests.rb | 2 +- tests/models/rds/security_group_tests.rb | 2 +- tests/models/rds/security_groups_tests.rb | 2 +- tests/models/rds/server_tests.rb | 2 +- tests/models/rds/servers_tests.rb | 2 +- tests/models/rds/snapshot_tests.rb | 2 +- tests/models/rds/snapshots_tests.rb | 2 +- tests/models/rds/tagging_tests.rb | 2 +- tests/models/sns/topic_tests.rb | 2 +- tests/models/sns/topics_tests.rb | 2 +- tests/models/storage/url_tests.rb | 6 +- tests/parsers/elb/describe_load_balancers.rb | 4 +- .../auto_scaling/auto_scaling_tests.rb | 34 ++--- .../auto_scaling/describe_types_tests.rb | 12 +- tests/requests/auto_scaling/helper.rb | 2 +- tests/requests/auto_scaling/model_tests.rb | 2 +- .../notification_configuration_tests.rb | 16 +-- tests/requests/auto_scaling/tag_tests.rb | 6 +- tests/requests/beanstalk/application_tests.rb | 2 +- .../beanstalk/solution_stack_tests.rb | 2 +- tests/requests/cloud_formation/stack_tests.rb | 2 +- .../get_metric_statistics_tests.rb | 4 +- .../requests/cloud_watch/list_metrics_test.rb | 4 +- .../cloud_watch/put_metric_data_tests.rb | 2 +- tests/requests/compute/address_tests.rb | 14 +-- .../compute/assign_private_ip_tests.rb | 4 +- tests/requests/compute/dhcp_options_tests.rb | 6 +- tests/requests/compute/helper.rb | 2 +- tests/requests/compute/image_tests.rb | 2 +- tests/requests/compute/instance_tests.rb | 2 +- .../compute/internet_gateway_tests.rb | 6 +- tests/requests/compute/key_pair_tests.rb | 2 +- tests/requests/compute/network_acl_tests.rb | 8 +- .../compute/network_interface_tests.rb | 4 +- .../requests/compute/placement_group_tests.rb | 4 +- tests/requests/compute/route_tests.rb | 22 ++-- .../requests/compute/security_group_tests.rb | 30 ++--- tests/requests/compute/snapshot_tests.rb | 4 +- .../spot_datafeed_subscription_tests.rb | 2 +- tests/requests/compute/subnet_tests.rb | 2 +- tests/requests/compute/tag_tests.rb | 12 +- tests/requests/compute/volume_tests.rb | 4 +- tests/requests/compute/vpc_tests.rb | 10 +- tests/requests/data_pipeline/helper.rb | 2 +- .../requests/data_pipeline/pipeline_tests.rb | 20 +-- tests/requests/dns/dns_tests.rb | 4 +- tests/requests/dns/helper.rb | 2 +- .../elasticache/cache_cluster_tests.rb | 44 +++---- tests/requests/elasticache/describe_events.rb | 6 +- .../describe_reserved_cache_nodes.rb | 6 +- tests/requests/elasticache/helper.rb | 2 +- .../elasticache/parameter_group_tests.rb | 32 ++--- .../elasticache/security_group_tests.rb | 30 ++--- .../elasticache/subnet_group_tests.rb | 8 +- tests/requests/elb/helper.rb | 2 +- tests/requests/elb/listener_tests.rb | 16 +-- tests/requests/elb/load_balancer_tests.rb | 16 +-- tests/requests/elb/policy_tests.rb | 26 ++-- tests/requests/emr/helper.rb | 2 +- tests/requests/emr/instance_group_tests.rb | 24 ++-- tests/requests/emr/job_flow_tests.rb | 26 ++-- tests/requests/glacier/archive_tests.rb | 2 +- .../glacier/multipart_upload_tests.rb | 2 +- tests/requests/glacier/tree_hash_tests.rb | 2 +- tests/requests/glacier/vault_tests.rb | 2 +- tests/requests/iam/access_key_tests.rb | 6 +- tests/requests/iam/account_policy_tests.rb | 6 +- tests/requests/iam/account_tests.rb | 2 +- tests/requests/iam/group_policy_tests.rb | 6 +- tests/requests/iam/group_tests.rb | 4 +- tests/requests/iam/helper.rb | 2 +- tests/requests/iam/login_profile_tests.rb | 6 +- tests/requests/iam/mfa_tests.rb | 2 +- tests/requests/iam/role_tests.rb | 14 +-- .../requests/iam/server_certificate_tests.rb | 16 +-- tests/requests/iam/user_policy_tests.rb | 6 +- tests/requests/iam/user_tests.rb | 8 +- tests/requests/rds/describe_events.rb | 6 +- .../requests/rds/event_subscription_tests.rb | 8 +- tests/requests/rds/helper.rb | 2 +- tests/requests/rds/instance_option_tests.rb | 4 +- tests/requests/rds/instance_tests.rb | 22 ++-- tests/requests/rds/log_file_tests.rb | 4 +- tests/requests/rds/parameter_group_tests.rb | 10 +- tests/requests/rds/parameter_request_tests.rb | 6 +- tests/requests/rds/security_group_tests.rb | 20 +-- tests/requests/rds/subnet_groups_tests.rb | 8 +- tests/requests/rds/tagging_tests.rb | 10 +- tests/requests/ses/helper.rb | 2 +- .../ses/verified_domain_identity_tests.rb | 4 +- .../ses/verified_email_address_tests.rb | 8 +- tests/requests/simpledb/attributes_tests.rb | 10 +- tests/requests/simpledb/domain_tests.rb | 10 +- tests/requests/simpledb/helper.rb | 2 +- tests/requests/sns/helper.rb | 2 +- tests/requests/sns/subscription_tests.rb | 12 +- tests/requests/sns/topic_tests.rb | 12 +- tests/requests/sqs/helper.rb | 2 +- tests/requests/sqs/message_tests.rb | 10 +- tests/requests/sqs/queue_tests.rb | 12 +- .../storage/delete_multiple_objects_tests.rb | 2 +- tests/requests/storage/object_tests.rb | 2 +- tests/requests/sts/assume_role_tests.rb | 2 +- .../sts/assume_role_with_saml_tests.rb | 2 +- .../sts/get_federation_token_tests.rb | 2 +- tests/requests/sts/session_token_tests.rb | 2 +- tests/signaturev4_tests.rb | 26 ++-- tests/signed_params_tests.rb | 2 +- tests/storage_tests.rb | 2 +- 512 files changed, 1350 insertions(+), 1175 deletions(-) create mode 100644 .travis.yml create mode 100644 gemfiles/Gemfile-edge create mode 100644 gemfiles/Gemfile-ruby-1.8.7 create mode 100644 tests/lorem.txt diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..da2a3a001 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,47 @@ +language: ruby + +sudo: false + +script: bundle exec rake test + +matrix: + fast_finish: true + include: + - rvm: 1.8.7 + gemfile: gemfiles/Gemfile-ruby-1.8.7 + - rvm: 1.9.3 + gemfile: Gemfile + - rvm: 2.0.0 + gemfile: Gemfile + - rvm: 2.1.0 + gemfile: Gemfile + - rvm: 2.1.1 + gemfile: Gemfile + - rvm: 2.1.1 + gemfile: gemfiles/Gemfile-edge + - rvm: 2.2.0 + gemfile: Gemfile + - rvm: 2.2.0 + gemfile: gemfiles/Gemfile-edge + - rvm: jruby-18mode + gemfile: gemfiles/Gemfile-ruby-1.8.7 + - rvm: jruby-19mode + gemfile: Gemfile + - rvm: jruby-head + gemfile: Gemfile + + allow_failures: + - rvm: jruby-head + +notifications: + email: false + irc: + channels: + - "irc.freenode.org#ruby-fog" + template: + - "[#%{build_number}] %{message} %{build_url}" + - "[#%{build_number}] %{commit} on %{branch} by %{author}" + - "[#%{build_number}] %{compare_url}" + on_success: always + on_failure: always + use_notice: false diff --git a/Rakefile b/Rakefile index 809eb5616..645547ad7 100644 --- a/Rakefile +++ b/Rakefile @@ -1,2 +1,8 @@ require "bundler/gem_tasks" +task :default => :test + +mock = ENV['FOG_MOCK'] || 'true' +task :test do + sh("export FOG_MOCK=#{mock} && bundle exec shindont") +end diff --git a/gemfiles/Gemfile-edge b/gemfiles/Gemfile-edge new file mode 100644 index 000000000..bd5433c7a --- /dev/null +++ b/gemfiles/Gemfile-edge @@ -0,0 +1,14 @@ +source "https://rubygems.org" + +# Shared components +gem "fog-core", :github => "fog/fog-core" +gem "fog-json", :github => "fog/fog-json" + +group :development, :test do + # This is here because gemspec doesn"t support require: false + gem "coveralls", :require => false + gem "netrc", :require => false + gem "octokit", :require => false +end + +gemspec :path => "../" diff --git a/gemfiles/Gemfile-ruby-1.8.7 b/gemfiles/Gemfile-ruby-1.8.7 new file mode 100644 index 000000000..25db794d1 --- /dev/null +++ b/gemfiles/Gemfile-ruby-1.8.7 @@ -0,0 +1,17 @@ +source "https://rubygems.org" + +gem 'activesupport', '~> 3.2' +gem 'nokogiri', '~>1.5.11' +gem 'mime-types', '~>1.16' +gem 'rest-client', '~> 1.6.7' +gem 'i18n', '~> 0.6.11' + +group :development, :test do + # This is here because gemspec doesn't support require: false + gem 'coveralls', :require => false + gem "netrc", :require => false + gem "octokit", '~> 2.7.2', :require => false + gem 'rake', '~> 10.1.0' +end + +gemspec :path => "../" diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb index a08911249..71761325e 100644 --- a/lib/fog/aws.rb +++ b/lib/fog/aws.rb @@ -2,6 +2,125 @@ require 'fog/aws/version' module Fog module AWS + class << self + def class_for(key) + case key + when :auto_scaling + Fog::AWS::AutoScaling + when :beanstalk + Fog::AWS::ElasticBeanstalk + when :cdn + Fog::CDN::AWS + when :cloud_formation + Fog::AWS::CloudFormation + when :cloud_watch + Fog::AWS::CloudWatch + when :compute + Fog::Compute::AWS + when :data_pipeline + Fog::AWS::DataPipeline + when :ddb, :dynamodb + Fog::AWS::DynamoDB + when :dns + Fog::DNS::AWS + when :elasticache + Fog::AWS::Elasticache + when :elb + Fog::AWS::ELB + when :emr + Fog::AWS::EMR + when :glacier + Fog::AWS::Glacier + when :iam + Fog::AWS::IAM + when :redshift + Fog::AWS::Redshift + when :sdb, :simpledb + Fog::AWS::SimpleDB + when :ses + Fog::AWS::SES + when :sqs + Fog::AWS::SQS + when :eu_storage, :storage + Fog::Storage::AWS + when :rds + Fog::AWS::RDS + when :sns + Fog::AWS::SNS + when :sts + Fog::AWS::STS + else + # @todo Replace most instances of ArgumentError with NotImplementedError + # @todo For a list of widely supported Exceptions, see: + # => http://www.zenspider.com/Languages/Ruby/QuickRef.html#35 + raise ArgumentError, "Unsupported #{self} service: #{key}" + end + end + + def [](service) + @@connections ||= Hash.new do |hash, key| + hash[key] = case key + when :auto_scaling + Fog::AWS::AutoScaling.new + when :beanstalk + Fog::AWS::ElasticBeanstalk.new + when :cdn + Fog::Logger.warning("Fog::AWS[:cdn] is not recommended, use CDN[:aws] for portability") + Fog::CDN.new(:provider => 'AWS') + when :cloud_formation + Fog::AWS::CloudFormation.new + when :cloud_watch + Fog::AWS::CloudWatch.new + when :compute + Fog::Logger.warning("Fog::AWS[:compute] is not recommended, use Compute[:aws] for portability") + Fog::Compute.new(:provider => 'AWS') + when :data_pipeline + Fog::AWS::DataPipeline + when :ddb, :dynamodb + Fog::AWS::DynamoDB.new + when :dns + Fog::Logger.warning("Fog::AWS[:dns] is not recommended, use DNS[:aws] for portability") + Fog::DNS.new(:provider => 'AWS') + when :elasticache + Fog::AWS::Elasticache.new + when :elb + Fog::AWS::ELB.new + when :emr + Fog::AWS::EMR.new + when :glacier + Fog::AWS::Glacier.new + when :iam + Fog::AWS::IAM.new + when :redshift + Fog::AWS::Redshift.new + when :rds + Fog::AWS::RDS.new + when :eu_storage + Fog::Storage.new(:provider => 'AWS', :region => 'eu-west-1') + when :sdb, :simpledb + Fog::AWS::SimpleDB.new + when :ses + Fog::AWS::SES.new + when :sqs + Fog::AWS::SQS.new + when :storage + Fog::Logger.warning("Fog::AWS[:storage] is not recommended, use Storage[:aws] for portability") + Fog::Storage.new(:provider => 'AWS') + when :sns + Fog::AWS::SNS.new + when :sts + Fog::AWS::STS.new + else + raise ArgumentError, "Unrecognized service: #{key.inspect}" + end + end + @@connections[service] + end + + def services + Fog::AWS.services + end + end end end diff --git a/lib/fog/aws/auto_scaling.rb b/lib/fog/aws/auto_scaling.rb index 8dad09fae..75cda1646 100644 --- a/lib/fog/aws/auto_scaling.rb +++ b/lib/fog/aws/auto_scaling.rb @@ -83,7 +83,7 @@ module Fog # * options<~Hash> - config arguments for connection. Defaults to {}. # # ==== Returns - # * AutoScaling object with connection to Aws. + # * AutoScaling object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] @@ -118,7 +118,7 @@ module Fog idempotent = params.delete(:idempotent) parser = params.delete(:parser) - body, headers = Aws.signed_params_v4( + body, headers = AWS.signed_params_v4( params, { 'Content-Type' => 'application/x-www-form-urlencoded' }, { diff --git a/lib/fog/aws/beanstalk.rb b/lib/fog/aws/beanstalk.rb index a00bf105d..144677a2e 100644 --- a/lib/fog/aws/beanstalk.rb +++ b/lib/fog/aws/beanstalk.rb @@ -108,7 +108,7 @@ module Fog idempotent = params.delete(:idempotent) parser = params.delete(:parser) - body, headers = Aws.signed_params_v4( + body, headers = AWS.signed_params_v4( params, { 'Content-Type' => 'application/x-www-form-urlencoded' }, { diff --git a/lib/fog/aws/cdn.rb b/lib/fog/aws/cdn.rb index 0665416e1..68106a004 100644 --- a/lib/fog/aws/cdn.rb +++ b/lib/fog/aws/cdn.rb @@ -2,7 +2,7 @@ require 'fog/aws/core' module Fog module CDN - class Aws < Fog::Service + class AWS < Fog::Service extend Fog::AWS::CredentialFetcher::ServiceMethods requires :aws_access_key_id, :aws_secret_access_key @@ -178,7 +178,7 @@ EOF params[:headers] ||= {} params[:headers]['Date'] = Fog::Time.now.to_date_header params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token - params[:headers]['Authorization'] = "Aws #{@aws_access_key_id}:#{signature(params)}" + params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}" params[:path] = "/#{@version}/#{params[:path]}" if @instrumentor diff --git a/lib/fog/aws/cloud_formation.rb b/lib/fog/aws/cloud_formation.rb index fca47b7ba..55b54c299 100644 --- a/lib/fog/aws/cloud_formation.rb +++ b/lib/fog/aws/cloud_formation.rb @@ -44,7 +44,7 @@ module Fog # * options<~Hash> - config arguments for connection. Defaults to {}. # # ==== Returns - # * CloudFormation object with connection to Aws. + # * CloudFormation object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] diff --git a/lib/fog/aws/cloud_watch.rb b/lib/fog/aws/cloud_watch.rb index 34f6306e8..8000ca129 100644 --- a/lib/fog/aws/cloud_watch.rb +++ b/lib/fog/aws/cloud_watch.rb @@ -87,7 +87,7 @@ module Fog # * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc. # # ==== Returns - # * CloudWatch object with connection to Aws. + # * CloudWatch object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] @@ -128,7 +128,7 @@ module Fog idempotent = params.delete(:idempotent) parser = params.delete(:parser) - body, headers = Aws.signed_params_v4( + body, headers = AWS.signed_params_v4( params, { 'Content-Type' => 'application/x-www-form-urlencoded' }, { diff --git a/lib/fog/aws/compute.rb b/lib/fog/aws/compute.rb index d1b97da8b..a382fde7c 100644 --- a/lib/fog/aws/compute.rb +++ b/lib/fog/aws/compute.rb @@ -2,7 +2,7 @@ require 'fog/aws/core' module Fog module Compute - class Aws < Fog::Service + class AWS < Fog::Service extend Fog::AWS::CredentialFetcher::ServiceMethods requires :aws_access_key_id, :aws_secret_access_key @@ -162,7 +162,7 @@ module Fog modify_image_attribute(*params) end - # http://docs.aws.amazon.com/AwsEC2/latest/UserGuide/ec2-supported-platforms.html + # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html def supported_platforms describe_account_attributes.body["accountAttributeSet"].find{ |h| h["attributeName"] == "supported-platforms" }["values"] end diff --git a/lib/fog/aws/core.rb b/lib/fog/aws/core.rb index 914e9afe9..3bbc56e1c 100644 --- a/lib/fog/aws/core.rb +++ b/lib/fog/aws/core.rb @@ -109,7 +109,7 @@ module Fog end end body.chop! - + headers['Authorization'] = options[:signer].sign({:method => options[:method], :headers => headers, :body => body, :query => {}, :path => options[:path]}, date) return body, headers @@ -117,7 +117,7 @@ module Fog def self.signed_params(params, options = {}) params.merge!({ - 'AwsAccessKeyId' => options[:aws_access_key_id], + 'AWSAccessKeyId' => options[:aws_access_key_id], 'SignatureMethod' => 'HmacSHA256', 'SignatureVersion' => '2', 'Timestamp' => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"), diff --git a/lib/fog/aws/data_pipeline.rb b/lib/fog/aws/data_pipeline.rb index 821173578..d898167b3 100644 --- a/lib/fog/aws/data_pipeline.rb +++ b/lib/fog/aws/data_pipeline.rb @@ -50,7 +50,7 @@ module Fog # * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc. # # ==== Returns - # * DataPipeline object with connection to Aws. + # * DataPipeline object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] @instrumentor = options[:instrumentor] diff --git a/lib/fog/aws/dns.rb b/lib/fog/aws/dns.rb index 6e6650cab..0b653b613 100644 --- a/lib/fog/aws/dns.rb +++ b/lib/fog/aws/dns.rb @@ -2,7 +2,7 @@ require 'fog/aws/core' module Fog module DNS - class Aws < Fog::Service + class AWS < Fog::Service extend Fog::AWS::CredentialFetcher::ServiceMethods requires :aws_access_key_id, :aws_secret_access_key @@ -127,7 +127,7 @@ module Fog params[:headers] ||= {} params[:headers]['Date'] = Fog::Time.now.to_date_header params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token - params[:headers]['X-Amzn-Authorization'] = "Aws3-HTTPS AwsAccessKeyId=#{@aws_access_key_id},Algorithm=HmacSHA1,Signature=#{signature(params)}" + params[:headers]['X-Amzn-Authorization'] = "AWS3-HTTPS AWSAccessKeyId=#{@aws_access_key_id},Algorithm=HmacSHA1,Signature=#{signature(params)}" params[:path] = "/#{@version}/#{params[:path]}" if @instrumentor diff --git a/lib/fog/aws/elb.rb b/lib/fog/aws/elb.rb index 211de950d..c46e4b07e 100644 --- a/lib/fog/aws/elb.rb +++ b/lib/fog/aws/elb.rb @@ -129,7 +129,7 @@ module Fog # * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc. # # ==== Returns - # * ELB object with connection to Aws. + # * ELB object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] diff --git a/lib/fog/aws/emr.rb b/lib/fog/aws/emr.rb index a4d996978..f7916b61d 100644 --- a/lib/fog/aws/emr.rb +++ b/lib/fog/aws/emr.rb @@ -59,7 +59,7 @@ module Fog # * region<~String> - optional region to use. For instance, in 'eu-west-1', 'us-east-1' and etc. # # ==== Returns - # * EMR object with connection to Aws. + # * EMR object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] @connection_options = options[:connection_options] || {} diff --git a/lib/fog/aws/glacier.rb b/lib/fog/aws/glacier.rb index afe99ed02..c1ecb91df 100644 --- a/lib/fog/aws/glacier.rb +++ b/lib/fog/aws/glacier.rb @@ -115,7 +115,7 @@ module Fog # * region<~String> - optional region to use. For instance, 'us-east-1' and etc. # # ==== Returns - # * Glacier object with connection to Aws. + # * Glacier object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] @region = options[:region] || 'us-east-1' diff --git a/lib/fog/aws/iam.rb b/lib/fog/aws/iam.rb index 8bb26efb3..ea7370273 100644 --- a/lib/fog/aws/iam.rb +++ b/lib/fog/aws/iam.rb @@ -171,7 +171,7 @@ module Fog # * options<~Hash> - config arguments for connection. Defaults to {}. # # ==== Returns - # * IAM object with connection to Aws. + # * IAM object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] diff --git a/lib/fog/aws/models/beanstalk/templates.rb b/lib/fog/aws/models/beanstalk/templates.rb index 2bc7eb4df..b94e176b6 100644 --- a/lib/fog/aws/models/beanstalk/templates.rb +++ b/lib/fog/aws/models/beanstalk/templates.rb @@ -10,7 +10,7 @@ module Fog # Describes all configuration templates, may optionally pass an ApplicationName filter # # Note: This is currently an expensive operation requiring multiple API calls due to a lack of - # a describe configuration templates call in the Aws API. + # a describe configuration templates call in the AWS API. def all(options={}) application_filter = [] if options.key?('ApplicationName') diff --git a/lib/fog/aws/models/cdn/distribution.rb b/lib/fog/aws/models/cdn/distribution.rb index 74816132c..1c99bfd3d 100644 --- a/lib/fog/aws/models/cdn/distribution.rb +++ b/lib/fog/aws/models/cdn/distribution.rb @@ -4,7 +4,7 @@ require 'fog/aws/models/cdn/distribution_helper' module Fog module CDN - class Aws + class AWS class Distribution < Fog::Model include Fog::CDN::AWS::DistributionHelper diff --git a/lib/fog/aws/models/cdn/distribution_helper.rb b/lib/fog/aws/models/cdn/distribution_helper.rb index 7568368a1..5217da2a5 100644 --- a/lib/fog/aws/models/cdn/distribution_helper.rb +++ b/lib/fog/aws/models/cdn/distribution_helper.rb @@ -2,7 +2,7 @@ require 'fog/core/collection' module Fog module CDN - class Aws + class AWS module DistributionHelper def destroy requires :identity, :etag, :caller_reference diff --git a/lib/fog/aws/models/cdn/distributions.rb b/lib/fog/aws/models/cdn/distributions.rb index 941ba8862..458a3b6ea 100644 --- a/lib/fog/aws/models/cdn/distributions.rb +++ b/lib/fog/aws/models/cdn/distributions.rb @@ -4,7 +4,7 @@ require 'fog/aws/models/cdn/distributions_helper' module Fog module CDN - class Aws + class AWS class Distributions < Fog::Collection include Fog::CDN::AWS::DistributionsHelper diff --git a/lib/fog/aws/models/cdn/distributions_helper.rb b/lib/fog/aws/models/cdn/distributions_helper.rb index aa9e1844c..7895df0f9 100644 --- a/lib/fog/aws/models/cdn/distributions_helper.rb +++ b/lib/fog/aws/models/cdn/distributions_helper.rb @@ -2,7 +2,7 @@ require 'fog/core/collection' module Fog module CDN - class Aws + class AWS module DistributionsHelper def all(options = {}) diff --git a/lib/fog/aws/models/cdn/invalidation.rb b/lib/fog/aws/models/cdn/invalidation.rb index 1239f043a..1b1d4d5ab 100644 --- a/lib/fog/aws/models/cdn/invalidation.rb +++ b/lib/fog/aws/models/cdn/invalidation.rb @@ -2,7 +2,7 @@ require 'fog/core/model' module Fog module CDN - class Aws + class AWS class Invalidation < Fog::Model identity :id, :aliases => 'Id' diff --git a/lib/fog/aws/models/cdn/invalidations.rb b/lib/fog/aws/models/cdn/invalidations.rb index 91b93efdc..2d9be24c7 100644 --- a/lib/fog/aws/models/cdn/invalidations.rb +++ b/lib/fog/aws/models/cdn/invalidations.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/cdn/invalidation' module Fog module CDN - class Aws + class AWS class Invalidations < Fog::Collection attribute :is_truncated, :aliases => ['IsTruncated'] attribute :max_items, :aliases => ['MaxItems'] diff --git a/lib/fog/aws/models/cdn/streaming_distribution.rb b/lib/fog/aws/models/cdn/streaming_distribution.rb index 9ed911b15..15f4e0f7b 100644 --- a/lib/fog/aws/models/cdn/streaming_distribution.rb +++ b/lib/fog/aws/models/cdn/streaming_distribution.rb @@ -4,7 +4,7 @@ require 'fog/aws/models/cdn/distribution_helper' module Fog module CDN - class Aws + class AWS class StreamingDistribution < Fog::Model include Fog::CDN::AWS::DistributionHelper diff --git a/lib/fog/aws/models/cdn/streaming_distributions.rb b/lib/fog/aws/models/cdn/streaming_distributions.rb index 29092626f..1c2e27036 100644 --- a/lib/fog/aws/models/cdn/streaming_distributions.rb +++ b/lib/fog/aws/models/cdn/streaming_distributions.rb @@ -4,7 +4,7 @@ require 'fog/aws/models/cdn/distributions_helper' module Fog module CDN - class Aws + class AWS class StreamingDistributions < Fog::Collection include Fog::CDN::AWS::DistributionsHelper diff --git a/lib/fog/aws/models/cloud_watch/alarm.rb b/lib/fog/aws/models/cloud_watch/alarm.rb index 406cd2e19..c301bc1d0 100644 --- a/lib/fog/aws/models/cloud_watch/alarm.rb +++ b/lib/fog/aws/models/cloud_watch/alarm.rb @@ -29,7 +29,7 @@ module Fog def initialize(attributes) attributes['EvaluationPeriods'] ||= 1 - attributes['Namespace'] ||= 'Aws/EC2' + attributes['Namespace'] ||= 'AWS/EC2' super end diff --git a/lib/fog/aws/models/compute/address.rb b/lib/fog/aws/models/compute/address.rb index c66748d8f..c35b87245 100644 --- a/lib/fog/aws/models/compute/address.rb +++ b/lib/fog/aws/models/compute/address.rb @@ -2,7 +2,7 @@ require 'fog/core/model' module Fog module Compute - class Aws + class AWS class Address < Fog::Model identity :public_ip, :aliases => 'publicIp' diff --git a/lib/fog/aws/models/compute/addresses.rb b/lib/fog/aws/models/compute/addresses.rb index 82d26b768..7447cbd80 100644 --- a/lib/fog/aws/models/compute/addresses.rb +++ b/lib/fog/aws/models/compute/addresses.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/address' module Fog module Compute - class Aws + class AWS class Addresses < Fog::Collection attribute :filters attribute :server @@ -14,13 +14,13 @@ module Fog # # ==== Returns # - #>> Aws.addresses.create + #>> AWS.addresses.create # # - # The IP address can be retrieved by running Aws.addresses.get("test"). See get method below. + # The IP address can be retrieved by running AWS.addresses.get("test"). See get method below. # def initialize(attributes) @@ -28,13 +28,13 @@ module Fog super end - # Aws.addresses.all + # AWS.addresses.all # # ==== Returns # # Returns an array of all IP addresses # - #>> Aws.addresses.all + #>> AWS.addresses.all # 'dhcpOptionsId' attribute :dhcp_configuration_set, :aliases => 'dhcpConfigurationSet' @@ -43,7 +43,7 @@ module Fog # Create a dhcp configuration set # - # >> g = Aws.dhcp_options.new() + # >> g = AWS.dhcp_options.new() # >> g.save # # == Returns: diff --git a/lib/fog/aws/models/compute/dhcp_options.rb b/lib/fog/aws/models/compute/dhcp_options.rb index 3f3813d32..9690f1c51 100644 --- a/lib/fog/aws/models/compute/dhcp_options.rb +++ b/lib/fog/aws/models/compute/dhcp_options.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/dhcp_option' module Fog module Compute - class Aws + class AWS class DhcpOptions < Fog::Collection attribute :filters @@ -11,13 +11,13 @@ module Fog # Creates a new dhcp option # - # Aws.dhcp_options.new + # AWS.dhcp_options.new # # ==== Returns # # Returns the details of the new DHCP options # - #>> Aws.dhcp_options.new + #>> AWS.dhcp_options.new #=> > Aws.dhcp_options.all + #>> AWS.dhcp_options.all #> Aws.dhcp_options.get("dopt-12345678") + #>> AWS.dhcp_options.get("dopt-12345678") #=> "vpc-12345678", "state"=>"available"}, diff --git a/lib/fog/aws/models/compute/flavor.rb b/lib/fog/aws/models/compute/flavor.rb index e9b39ef2b..e305e18fe 100644 --- a/lib/fog/aws/models/compute/flavor.rb +++ b/lib/fog/aws/models/compute/flavor.rb @@ -2,7 +2,7 @@ require 'fog/core/model' module Fog module Compute - class Aws + class AWS class Flavor < Fog::Model identity :id diff --git a/lib/fog/aws/models/compute/flavors.rb b/lib/fog/aws/models/compute/flavors.rb index dc91e9ba7..d0824a9a3 100644 --- a/lib/fog/aws/models/compute/flavors.rb +++ b/lib/fog/aws/models/compute/flavors.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/flavor' module Fog module Compute - class Aws + class AWS FLAVORS = [ { :id => 't1.micro', @@ -392,13 +392,13 @@ module Fog # Returns an array of all flavors that have been created # - # Aws.flavors.all + # AWS.flavors.all # # ==== Returns # # Returns an array of all available instances and their general information # - #>> Aws.flavors.all + #>> AWS.flavors.all # > Aws.flavors.get("t1.micro") + #>> AWS.flavors.get("t1.micro") # 'imageId' diff --git a/lib/fog/aws/models/compute/images.rb b/lib/fog/aws/models/compute/images.rb index 03bd093b4..c2453608d 100644 --- a/lib/fog/aws/models/compute/images.rb +++ b/lib/fog/aws/models/compute/images.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/image' module Fog module Compute - class Aws + class AWS class Images < Fog::Collection attribute :filters @@ -11,13 +11,13 @@ module Fog # Creates a new Amazon machine image # - # Aws.images.new + # AWS.images.new # # ==== Returns # # Returns the details of the new image # - #>> Aws.images.new + #>> AWS.images.new # 'internetGatewayId' attribute :attachment_set, :aliases => 'attachmentSet' @@ -57,7 +57,7 @@ module Fog # Create an internet gateway # - # >> g = Aws.internet_gateways.new() + # >> g = AWS.internet_gateways.new() # >> g.save # # == Returns: diff --git a/lib/fog/aws/models/compute/internet_gateways.rb b/lib/fog/aws/models/compute/internet_gateways.rb index 0fd1ae1ec..073d5cad5 100644 --- a/lib/fog/aws/models/compute/internet_gateways.rb +++ b/lib/fog/aws/models/compute/internet_gateways.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/internet_gateway' module Fog module Compute - class Aws + class AWS class InternetGateways < Fog::Collection attribute :filters @@ -11,13 +11,13 @@ module Fog # Creates a new internet gateway # - # Aws.internet_gateways.new + # AWS.internet_gateways.new # # ==== Returns # # Returns the details of the new InternetGateway # - #>> Aws.internet_gateways.new + #>> AWS.internet_gateways.new #=> > Aws.internet_gateways.all + #>> AWS.internet_gateways.all #> Aws.internet_gateways.get("igw-12345678") + #>> AWS.internet_gateways.get("igw-12345678") #=> "vpc-12345678", "state"=>"available"}, diff --git a/lib/fog/aws/models/compute/key_pair.rb b/lib/fog/aws/models/compute/key_pair.rb index 8206d4451..1ba3d6e13 100644 --- a/lib/fog/aws/models/compute/key_pair.rb +++ b/lib/fog/aws/models/compute/key_pair.rb @@ -2,7 +2,7 @@ require 'fog/core/model' module Fog module Compute - class Aws + class AWS class KeyPair < Fog::Model identity :name, :aliases => 'keyName' diff --git a/lib/fog/aws/models/compute/key_pairs.rb b/lib/fog/aws/models/compute/key_pairs.rb index 586479b8a..8abec12d6 100644 --- a/lib/fog/aws/models/compute/key_pairs.rb +++ b/lib/fog/aws/models/compute/key_pairs.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/key_pair' module Fog module Compute - class Aws + class AWS class KeyPairs < Fog::Collection attribute :filters attribute :key_name @@ -11,7 +11,7 @@ module Fog model Fog::Compute::AWS::KeyPair # Used to create a key pair. There are 3 arguments and only name is required. You can generate a new key_pair as follows: - # Aws.key_pairs.create(:name => "test", :fingerprint => "123", :private_key => '234234') + # AWS.key_pairs.create(:name => "test", :fingerprint => "123", :private_key => '234234') # # ==== Returns # @@ -21,7 +21,7 @@ module Fog # private_key="-----BEGIN RSA PRIVATE KEY-----\nf/VtfXJ/ekTSlRS2GSItBSzMrEGoZ+EXeMOuiA7HFkDcgKt6aBiOX9Bysiyfc1rIrgWdFKqXBRJA\nrtvBPa3/32koMPV4FxG7RZrPuKLITmFoEV86M0DSLo+ErlOPuDChfrR9dk6eI17/o1VmSvYsIpDc\njvbgx+tt7ZEPvduoUag7YdnUI0f20fttsdXjMlyDg9pPOVF3/hqucqOb3t5y9lvVJJxdTnEDFSjb\nvodpaDT9+ssw4IsQsZEIvfL0hK+Lt4phbclUWfG7JVnYfdd2u4zU6Nqe0+3qoR0ZOH4/zaUko7z8\n7JMbJqs5bmdWfnQTrvbJ13545FRI/W48ZRJxqPcj0t2MzasbT4gMgtNJrSadq78RkRJjNTu4lZmK\nvJejkBZPicHvo5IRSEbDc90Rhdh0aZNifXn0d0DSV2N6Ywo2o1lwRAi3/l6XSjukyRpTPcMr14MP\ntGwS1Tvez41Oa7Y96VfsJB2xtKc6LGRFiPUg2ZAEHU15Q9bIISVzHXgdAcef1bsh8UN/fDBrTusm\nvJisQ+dLaPH7cZ03od+XTwJc+IyeL4RqWuASE0NNfEVJMS+qcpt0WeNzfG0C27SwIcfEKL0sC0kn\nCfX2WpZDg7T5xN+88ftKJaN9tymxTgvoJVS1/WKvWBAXVozKp4f6K8wKmwf7VdUt/FWbUi54LW02\nf1ONkaYEOVwDgWlGxVSx43MWqvVdT2MPFNEBL7OA1LPwCO2nyQQ9UM9gCE65S9Najf939Bq8xwqx\nGNFlLmaH6biZUyL8ewRJ8Y7rMQ5cXy/gHZywjkuoyLQ8vVpmVpb7r1FaM/AYSr5l6gJEWdqbJleN\ntnhjPeE6qXISzIUBvwKzzgFTyW8ZHQtgbP3bHEiPG2/OjKHnLUoOId/eetcE+ovIxWsBrTDbf2SV\nYUD91u+W9K35eX89ZaIiohLNg4z9+QHCs4rcWyOXEfprBKcP2QU5+Y9ysnXLAmZt6QhInaAsUpQZ\nyhImA24UqvqrK0yyGhf/quouK7q0QkVQR+f7nGClIaphJkxO/xylrnK/pYObr4s3B8kmksuHiYOu\n1yz6SeRkj8F9dxkRmzbBK/G0tLkxIElDbM7icI9gsEO7vvgaR/K8hSDi0RkFPG43I20tU8PqwHe7\nR4jFW+6sB2+9FDeLn+qkoDSaxzmAuIRW082z/r7rJVIpFEo14hNhQYkNXpH40+P/hA9RFgvhZe8M\nvK4rz/eu246Kij6kObieTfpZhgGHqvtU8x5cnqEZOz5Hc5m4B+gMaTA53kFSPOA0pn6gqgiuYEdI\nZUhO8P1PkNqkmLz7NJRnz3qpAo6RisAxPBVr2WdSg4bP0YpGS/0TE4OOJwGLldx6dCsX60++mn0q\n1fhNw8oyZiguYMAeEEDWP8x/bsRaFz5L8uQVnnnj8ei1oTmZ+Uw9/48snWYcurL2jsbuWhhE0NTt\nfe/cqov7ZaZHs+Tr20ZBEDEqUEWr/MMskj/ZSVxnza1G/hztFJMAThF9ZJoGQkHWHfXCGOLLGY+z\nqi0SC8EIeu8PUxjO2SRj9S9o/Dwg3iHyM3pj57kD7fDNnl3Ed6LMoCXoaQV8BdMX4xh=\n-----END RSA PRIVATE KEY-----" #> # - # The key_pair can be retrieved by running Aws.key_pairs.get("test"). See get method below. + # The key_pair can be retrieved by running AWS.key_pairs.get("test"). See get method below. # def initialize(attributes) @@ -31,7 +31,7 @@ module Fog # Returns an array of all key pairs that have been created # - # Aws.key_pairs.all + # AWS.key_pairs.all # # ==== Returns # @@ -57,15 +57,15 @@ module Fog load(data['keySet']) end - # Used to retrieve a key pair that was created with the Aws.key_pairs.create method. + # Used to retrieve a key pair that was created with the AWS.key_pairs.create method. # The name is required to get the associated key_pair information. # # You can run the following command to get the details: - # Aws.key_pairs.get("test") + # AWS.key_pairs.get("test") # # ==== Returns # - #>> Aws.key_pairs.get("test") + #>> AWS.key_pairs.get("test") # > g = Aws.network_acls.new(:vpc_id => 'vpc-abcdefgh') + # >> g = AWS.network_acls.new(:vpc_id => 'vpc-abcdefgh') # >> g.save def save requires :vpc_id diff --git a/lib/fog/aws/models/compute/network_acls.rb b/lib/fog/aws/models/compute/network_acls.rb index f00dce4ec..4abbf543f 100644 --- a/lib/fog/aws/models/compute/network_acls.rb +++ b/lib/fog/aws/models/compute/network_acls.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/network_acl' module Fog module Compute - class Aws + class AWS class NetworkAcls < Fog::Collection attribute :filters @@ -11,7 +11,7 @@ module Fog # Creates a new network ACL # - # Aws.network_acls.new + # AWS.network_acls.new # # ==== Returns # @@ -33,13 +33,13 @@ module Fog # Returns an array of all network ACLs that have been created # - # Aws.network_acls.all + # AWS.network_acls.all # # ==== Returns # # Returns an array of all network ACLs # - #>> Aws.network_acls.all + #>> AWS.network_acls.all # > Aws.network_acls.get("acl-abcdefgh") + #>> AWS.network_acls.get("acl-abcdefgh") # 'networkInterfaceId' attribute :state @@ -44,7 +44,7 @@ module Fog # Create a network_interface # - # >> g = Aws.network_interfaces.new(:subnet_id => "subnet-someId", options) + # >> g = AWS.network_interfaces.new(:subnet_id => "subnet-someId", options) # >> g.save # # options is an optional hash which may contain 'PrivateIpAddress', 'Description', 'GroupSet' diff --git a/lib/fog/aws/models/compute/network_interfaces.rb b/lib/fog/aws/models/compute/network_interfaces.rb index 416ea9db3..80ead12b4 100644 --- a/lib/fog/aws/models/compute/network_interfaces.rb +++ b/lib/fog/aws/models/compute/network_interfaces.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/network_interface' module Fog module Compute - class Aws + class AWS class NetworkInterfaces < Fog::Collection attribute :filters @@ -11,13 +11,13 @@ module Fog # Creates a new network interface # - # Aws.network_interfaces.new + # AWS.network_interfaces.new # # ==== Returns # # Returns the details of the new network interface # - #>> Aws.network_interfaces.new + #>> AWS.network_interfaces.new # > Aws.network_interfaves.all + #>> AWS.network_interfaves.all # > Aws.NetworkInterface.get("eni-11223344") + #>> AWS.NetworkInterface.get("eni-11223344") # 'routeTableId' diff --git a/lib/fog/aws/models/compute/route_tables.rb b/lib/fog/aws/models/compute/route_tables.rb index 825a624c1..7e3d2c005 100755 --- a/lib/fog/aws/models/compute/route_tables.rb +++ b/lib/fog/aws/models/compute/route_tables.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/route_table' module Fog module Compute - class Aws + class AWS class RouteTables < Fog::Collection attribute :filters @@ -11,13 +11,13 @@ module Fog # Creates a new route table # - # Aws.route_tables.new + # AWS.route_tables.new # # ==== Returns # # Returns the details of the new route table # - #>> Aws.route_tables.new + #>> AWS.route_tables.new # > Aws.route_tables.all + #>> AWS.route_tables.all # > Aws.route_tables.get("rtb-41e8552f") + #>> AWS.route_tables.get("rtb-41e8552f") # 'groupName' attribute :description, :aliases => 'groupDescription' @@ -15,7 +15,7 @@ module Fog # Authorize access by another security group # - # >> g = Aws.security_groups.all(:description => "something").first + # >> g = AWS.security_groups.all(:description => "something").first # >> g.authorize_group_and_owner("some_group_name", "1234567890") # # == Parameters: @@ -54,7 +54,7 @@ module Fog # Authorize a new port range for a security group # - # >> g = Aws.security_groups.all(:description => "something").first + # >> g = AWS.security_groups.all(:description => "something").first # >> g.authorize_port_range(20..21) # # == Parameters: @@ -129,7 +129,7 @@ module Fog # Revoke access by another security group # - # >> g = Aws.security_groups.all(:description => "something").first + # >> g = AWS.security_groups.all(:description => "something").first # >> g.revoke_group_and_owner("some_group_name", "1234567890") # # == Parameters: @@ -168,7 +168,7 @@ module Fog # Revoke an existing port range for a security group # - # >> g = Aws.security_groups.all(:description => "something").first + # >> g = AWS.security_groups.all(:description => "something").first # >> g.revoke_port_range(20..21) # # == Parameters: @@ -223,7 +223,7 @@ module Fog # Reload a security group # - # >> g = Aws.security_groups.get(:name => "some_name") + # >> g = AWS.security_groups.get(:name => "some_name") # >> g.reload # # == Returns: @@ -253,7 +253,7 @@ module Fog # Create a security group # - # >> g = Aws.security_groups.new(:name => "some_name", :description => "something") + # >> g = AWS.security_groups.new(:name => "some_name", :description => "something") # >> g.save # # == Returns: diff --git a/lib/fog/aws/models/compute/security_groups.rb b/lib/fog/aws/models/compute/security_groups.rb index 35159ba3e..0f92c0ec9 100644 --- a/lib/fog/aws/models/compute/security_groups.rb +++ b/lib/fog/aws/models/compute/security_groups.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/security_group' module Fog module Compute - class Aws + class AWS class SecurityGroups < Fog::Collection attribute :filters @@ -11,13 +11,13 @@ module Fog # Creates a new security group # - # Aws.security_groups.new + # AWS.security_groups.new # # ==== Returns # # Returns the details of the new image # - #>> Aws.security_groups.new + #>> AWS.security_groups.new # > Aws.security_groups.all + #>> AWS.security_groups.all # > Aws.security_groups.get("default") + #>> AWS.security_groups.get("default") # > Aws.security_groups.get_by_id("sg-123456") + #>> AWS.security_groups.get_by_id("sg-123456") # > Aws.servers.new + #>> AWS.servers.new # > Aws.servers.get("i-5c973972") + #>> AWS.servers.get("i-5c973972") # 'snapshotId' diff --git a/lib/fog/aws/models/compute/snapshots.rb b/lib/fog/aws/models/compute/snapshots.rb index b8057097d..9a131ae84 100644 --- a/lib/fog/aws/models/compute/snapshots.rb +++ b/lib/fog/aws/models/compute/snapshots.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/snapshot' module Fog module Compute - class Aws + class AWS class Snapshots < Fog::Collection attribute :filters attribute :volume diff --git a/lib/fog/aws/models/compute/spot_request.rb b/lib/fog/aws/models/compute/spot_request.rb index e8c91a562..cd7879d35 100644 --- a/lib/fog/aws/models/compute/spot_request.rb +++ b/lib/fog/aws/models/compute/spot_request.rb @@ -2,7 +2,7 @@ require 'fog/compute/models/server' module Fog module Compute - class Aws + class AWS class SpotRequest < Fog::Compute::Server identity :id, :aliases => 'spotInstanceRequestId' diff --git a/lib/fog/aws/models/compute/spot_requests.rb b/lib/fog/aws/models/compute/spot_requests.rb index a3b167446..21fe0a16e 100644 --- a/lib/fog/aws/models/compute/spot_requests.rb +++ b/lib/fog/aws/models/compute/spot_requests.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/spot_request' module Fog module Compute - class Aws + class AWS class SpotRequests < Fog::Collection attribute :filters diff --git a/lib/fog/aws/models/compute/subnet.rb b/lib/fog/aws/models/compute/subnet.rb index 76b9a9d7d..d515fab25 100644 --- a/lib/fog/aws/models/compute/subnet.rb +++ b/lib/fog/aws/models/compute/subnet.rb @@ -2,7 +2,7 @@ require 'fog/core/model' module Fog module Compute - class Aws + class AWS class Subnet < Fog::Model identity :subnet_id, :aliases => 'subnetId' attribute :state @@ -36,7 +36,7 @@ module Fog # Create a subnet # - # >> g = Aws.subnets.new(:vpc_id => "vpc-someId", :cidr_block => "10.0.0.0/24") + # >> g = AWS.subnets.new(:vpc_id => "vpc-someId", :cidr_block => "10.0.0.0/24") # >> g.save # # == Returns: diff --git a/lib/fog/aws/models/compute/subnets.rb b/lib/fog/aws/models/compute/subnets.rb index bbc757249..80f2e35f9 100644 --- a/lib/fog/aws/models/compute/subnets.rb +++ b/lib/fog/aws/models/compute/subnets.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/subnet' module Fog module Compute - class Aws + class AWS class Subnets < Fog::Collection attribute :filters @@ -11,13 +11,13 @@ module Fog # Creates a new subnet # - # Aws.subnets.new + # AWS.subnets.new # # ==== Returns # # Returns the details of the new Subnet # - #>> Aws.subnets.new + #>> AWS.subnets.new # > Aws.subnets.all + #>> AWS.subnets.all # > Aws.subnets.get("subnet-12345678") + #>> AWS.subnets.get("subnet-12345678") # 'volumeId' diff --git a/lib/fog/aws/models/compute/volumes.rb b/lib/fog/aws/models/compute/volumes.rb index 71abf0a28..73c990a97 100644 --- a/lib/fog/aws/models/compute/volumes.rb +++ b/lib/fog/aws/models/compute/volumes.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/volume' module Fog module Compute - class Aws + class AWS class Volumes < Fog::Collection attribute :filters attribute :server @@ -11,7 +11,7 @@ module Fog model Fog::Compute::AWS::Volume # Used to create a volume. There are 3 arguments and availability_zone and size are required. You can generate a new key_pair as follows: - # Aws.volumes.create(:availability_zone => 'us-east-1a', :size => 10) + # AWS.volumes.create(:availability_zone => 'us-east-1a', :size => 10) # # ==== Returns # @@ -29,7 +29,7 @@ module Fog # tags=nil #> # - # The volume can be retrieved by running Aws.volumes.get("vol-1e2028b9"). See get method below. + # The volume can be retrieved by running AWS.volumes.get("vol-1e2028b9"). See get method below. # def initialize(attributes) @@ -38,11 +38,11 @@ module Fog end # Used to return all volumes. - # Aws.volumes.all + # AWS.volumes.all # # ==== Returns # - #>>Aws.volumes.all + #>>AWS.volumes.all # # - # The volume can be retrieved by running Aws.volumes.get("vol-1e2028b9"). See get method below. + # The volume can be retrieved by running AWS.volumes.get("vol-1e2028b9"). See get method below. # def all(filters_arg = filters) @@ -78,11 +78,11 @@ module Fog # volume_id is required to get the associated volume information. # # You can run the following command to get the details: - # Aws.volumes.get("vol-1e2028b9") + # AWS.volumes.get("vol-1e2028b9") # # ==== Returns # - #>> Aws.volumes.get("vol-1e2028b9") + #>> AWS.volumes.get("vol-1e2028b9") # 'vpcId' @@ -41,7 +41,7 @@ module Fog # Create a vpc # - # >> g = Aws.vpcs.new(:cidr_block => "10.1.2.0/24") + # >> g = AWS.vpcs.new(:cidr_block => "10.1.2.0/24") # >> g.save # # == Returns: diff --git a/lib/fog/aws/models/compute/vpcs.rb b/lib/fog/aws/models/compute/vpcs.rb index 43fdea9e7..625fcf37c 100644 --- a/lib/fog/aws/models/compute/vpcs.rb +++ b/lib/fog/aws/models/compute/vpcs.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/compute/vpc' module Fog module Compute - class Aws + class AWS class Vpcs < Fog::Collection attribute :filters @@ -11,13 +11,13 @@ module Fog # Creates a new VPC # - # Aws.vpcs.new + # AWS.vpcs.new # # ==== Returns # # Returns the details of the new VPC # - #>> Aws.vpcs.new + #>> AWS.vpcs.new # > Aws.vpcs.all + #>> AWS.vpcs.all # > Aws.vpcs.get("vpc-12345678") + #>> AWS.vpcs.get("vpc-12345678") # ['IsTruncated'] attribute :max_items, :aliases => ['MaxItems'] @@ -66,7 +66,7 @@ module Fog end # - # Aws Route 53 records are uniquely identified by a compound key of name, type, and identifier. + # AWS Route 53 records are uniquely identified by a compound key of name, type, and identifier. # #get allows one to retrieve a record using one or more of those key components. # # ==== Parameters diff --git a/lib/fog/aws/models/dns/zone.rb b/lib/fog/aws/models/dns/zone.rb index 9b90ca1b9..aee0edefd 100644 --- a/lib/fog/aws/models/dns/zone.rb +++ b/lib/fog/aws/models/dns/zone.rb @@ -3,7 +3,7 @@ require 'fog/core/model' module Fog module DNS - class Aws + class AWS class Zone < Fog::Model identity :id, :aliases => 'Id' diff --git a/lib/fog/aws/models/dns/zones.rb b/lib/fog/aws/models/dns/zones.rb index eaff73d64..cffccbca1 100644 --- a/lib/fog/aws/models/dns/zones.rb +++ b/lib/fog/aws/models/dns/zones.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/dns/zone' module Fog module DNS - class Aws + class AWS class Zones < Fog::Collection attribute :marker, :aliases => 'Marker' attribute :max_items, :aliases => 'MaxItems' diff --git a/lib/fog/aws/models/iam/access_keys.rb b/lib/fog/aws/models/iam/access_keys.rb index 147000afe..8031f0889 100644 --- a/lib/fog/aws/models/iam/access_keys.rb +++ b/lib/fog/aws/models/iam/access_keys.rb @@ -14,7 +14,7 @@ module Fog def all data = service.list_access_keys('UserName'=> @username).body['AccessKeys'] - # Aws response doesn't contain the UserName, this injects it + # AWS response doesn't contain the UserName, this injects it data.each {|access_key| access_key['UserName'] = @username } load(data) end diff --git a/lib/fog/aws/models/iam/policies.rb b/lib/fog/aws/models/iam/policies.rb index 7bdbadfed..8c80e7e06 100644 --- a/lib/fog/aws/models/iam/policies.rb +++ b/lib/fog/aws/models/iam/policies.rb @@ -14,7 +14,7 @@ module Fog end def all - # Aws method get_user_policy only returns an array of policy names, this is kind of useless, + # AWS method get_user_policy only returns an array of policy names, this is kind of useless, # that's why it has to loop through the list to get the details of each element. I don't like it because it makes this method slow policy_names = service.list_user_policies(@username).body['PolicyNames'] # it returns an array policies = [] diff --git a/lib/fog/aws/models/storage/directories.rb b/lib/fog/aws/models/storage/directories.rb index 533ca58f4..cf1c0f0aa 100644 --- a/lib/fog/aws/models/storage/directories.rb +++ b/lib/fog/aws/models/storage/directories.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/storage/directory' module Fog module Storage - class Aws + class AWS class Directories < Fog::Collection model Fog::Storage::AWS::Directory diff --git a/lib/fog/aws/models/storage/directory.rb b/lib/fog/aws/models/storage/directory.rb index 9900665c7..814902a68 100644 --- a/lib/fog/aws/models/storage/directory.rb +++ b/lib/fog/aws/models/storage/directory.rb @@ -4,7 +4,7 @@ require 'fog/aws/models/storage/versions' module Fog module Storage - class Aws + class AWS class Directory < Fog::Model VALID_ACLS = ['private', 'public-read', 'public-read-write', 'authenticated-read'] diff --git a/lib/fog/aws/models/storage/file.rb b/lib/fog/aws/models/storage/file.rb index d89d4153a..286fa5c70 100644 --- a/lib/fog/aws/models/storage/file.rb +++ b/lib/fog/aws/models/storage/file.rb @@ -3,9 +3,9 @@ require 'fog/aws/models/storage/versions' module Fog module Storage - class Aws + class AWS class File < Fog::Model - # @see Aws Object docs http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectOps.html + # @see AWS Object docs http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectOps.html identity :key, :aliases => 'Key' @@ -180,7 +180,7 @@ module Fog # @option options [String] content_encoding sets Content-Encoding HTTP header. For example, 'x-gzip' # @option options [String] content_md5 sets Content-MD5. For example, '79054025255fb1a26e4bc422aef54eb4' # @option options [String] content_type Content-Type. For example, 'text/plain' - # @option options [String] expires sets number of seconds before Aws Object expires. + # @option options [String] expires sets number of seconds before AWS Object expires. # @option options [String] storage_class sets x-amz-storage-class HTTP header. Defaults to 'STANDARD'. Or, 'REDUCED_REDUNDANCY' # @option options [String] encryption sets HTTP encryption header. Set to 'AES256' to encrypt files at rest on S3 # @return [Boolean] true if no errors diff --git a/lib/fog/aws/models/storage/files.rb b/lib/fog/aws/models/storage/files.rb index 606fe363e..3498485b4 100644 --- a/lib/fog/aws/models/storage/files.rb +++ b/lib/fog/aws/models/storage/files.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/storage/file' module Fog module Storage - class Aws + class AWS class Files < Fog::Collection extend Fog::Deprecation deprecate :get_url, :get_https_url diff --git a/lib/fog/aws/models/storage/version.rb b/lib/fog/aws/models/storage/version.rb index d663877e4..9186394ff 100644 --- a/lib/fog/aws/models/storage/version.rb +++ b/lib/fog/aws/models/storage/version.rb @@ -2,7 +2,7 @@ require 'fog/core/model' module Fog module Storage - class Aws + class AWS class Version < Fog::Model identity :version, :aliases => 'VersionId' diff --git a/lib/fog/aws/models/storage/versions.rb b/lib/fog/aws/models/storage/versions.rb index a574d2cb4..2a400d8c2 100644 --- a/lib/fog/aws/models/storage/versions.rb +++ b/lib/fog/aws/models/storage/versions.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/storage/version' module Fog module Storage - class Aws + class AWS class Versions < Fog::Collection attribute :file attribute :directory diff --git a/lib/fog/aws/parsers/elb/tag_list_parser.rb b/lib/fog/aws/parsers/elb/tag_list_parser.rb index 376012a5b..e716e86ee 100644 --- a/lib/fog/aws/parsers/elb/tag_list_parser.rb +++ b/lib/fog/aws/parsers/elb/tag_list_parser.rb @@ -2,7 +2,7 @@ module Fog module Parsers module AWS module ELB - # parses an XML-formatted list of resource tags from Aws + # parses an XML-formatted list of resource tags from AWS class TagListParser < Fog::Parsers::Base # each tag is modeled as a String pair (2-element Array) diff --git a/lib/fog/aws/parsers/rds/tag_list_parser.rb b/lib/fog/aws/parsers/rds/tag_list_parser.rb index 76766c258..a453dadf6 100644 --- a/lib/fog/aws/parsers/rds/tag_list_parser.rb +++ b/lib/fog/aws/parsers/rds/tag_list_parser.rb @@ -2,7 +2,7 @@ module Fog module Parsers module AWS module RDS - # parses an XML-formatted list of resource tags from Aws + # parses an XML-formatted list of resource tags from AWS class TagListParser < Fog::Parsers::Base # each tag is modeled as a String pair (2-element Array) def reset diff --git a/lib/fog/aws/rds.rb b/lib/fog/aws/rds.rb index 98d112ed0..14e559a50 100644 --- a/lib/fog/aws/rds.rb +++ b/lib/fog/aws/rds.rb @@ -165,7 +165,7 @@ module Fog # * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc. # # ==== Returns - # * ELB object with connection to Aws. + # * ELB object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] @instrumentor = options[:instrumentor] diff --git a/lib/fog/aws/redshift.rb b/lib/fog/aws/redshift.rb index 6dcfa31c6..791426031 100644 --- a/lib/fog/aws/redshift.rb +++ b/lib/fog/aws/redshift.rb @@ -71,7 +71,7 @@ module Fog # * region<~String> - optional region to use. For instance, 'us-east-1' and etc. # # ==== Returns - # * Redshift object with connection to Aws. + # * Redshift object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] diff --git a/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb b/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb index ad5b64a59..3b110bb50 100644 --- a/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb +++ b/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb @@ -65,10 +65,10 @@ module Fog ExpectedOptions[:create_auto_scaling_group] = %w[DefaultCooldown DesiredCapacity HealthCheckGracePeriod HealthCheckType LoadBalancerNames PlacementGroup Tags TerminationPolicies VPCZoneIdentifier] def create_auto_scaling_group(auto_scaling_group_name, availability_zones, launch_configuration_name, max_size, min_size, options = {}) - options.merge!(Aws.indexed_param('AvailabilityZones.member.%d', [*availability_zones])) + options.merge!(AWS.indexed_param('AvailabilityZones.member.%d', [*availability_zones])) options.delete('AvailabilityZones') if load_balancer_names = options.delete('LoadBalancerNames') - options.merge!(Aws.indexed_param('LoadBalancerNames.member.%d', [*load_balancer_names])) + options.merge!(AWS.indexed_param('LoadBalancerNames.member.%d', [*load_balancer_names])) end if tags = options.delete('Tags') @@ -78,7 +78,7 @@ module Fog end end if termination_policies = options.delete('TerminationPolicies') - options.merge!(Aws.indexed_param('TerminationPolicies.member.%d', [*termination_policies])) + options.merge!(AWS.indexed_param('TerminationPolicies.member.%d', [*termination_policies])) end request({ diff --git a/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb b/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb index a3de444e1..9e117d2f9 100644 --- a/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb +++ b/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb @@ -62,7 +62,7 @@ module Fog end end if security_groups = options.delete('SecurityGroups') - options.merge!(Aws.indexed_param('SecurityGroups.member.%d', [*security_groups])) + options.merge!(AWS.indexed_param('SecurityGroups.member.%d', [*security_groups])) end if options['UserData'] options['UserData'] = Base64.encode64(options['UserData']) diff --git a/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_groups.rb b/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_groups.rb index 1f7c80140..6c27e3eea 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_groups.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_groups.rb @@ -95,7 +95,7 @@ module Fog # def describe_auto_scaling_groups(options = {}) if auto_scaling_group_names = options.delete('AutoScalingGroupNames') - options.merge!(Aws.indexed_param('AutoScalingGroupNames.member.%d', [*auto_scaling_group_names])) + options.merge!(AWS.indexed_param('AutoScalingGroupNames.member.%d', [*auto_scaling_group_names])) end request({ 'Action' => 'DescribeAutoScalingGroups', diff --git a/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb b/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb index de258366e..18f215eca 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb @@ -56,7 +56,7 @@ module Fog # def describe_auto_scaling_instances(options = {}) if instance_ids = options.delete('InstanceIds') - options.merge!(Aws.indexed_param('InstanceIds.member.%d', [*instance_ids])) + options.merge!(AWS.indexed_param('InstanceIds.member.%d', [*instance_ids])) end request({ 'Action' => 'DescribeAutoScalingInstances', diff --git a/lib/fog/aws/requests/auto_scaling/describe_launch_configurations.rb b/lib/fog/aws/requests/auto_scaling/describe_launch_configurations.rb index 4f9b69045..aa45b3f8a 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_launch_configurations.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_launch_configurations.rb @@ -72,7 +72,7 @@ module Fog # def describe_launch_configurations(options = {}) if launch_configuration_names = options.delete('LaunchConfigurationNames') - options.merge!(Aws.indexed_param('LaunchConfigurationNames.member.%d', [*launch_configuration_names])) + options.merge!(AWS.indexed_param('LaunchConfigurationNames.member.%d', [*launch_configuration_names])) end request({ 'Action' => 'DescribeLaunchConfigurations', diff --git a/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb b/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb index 9f67bfe85..247ae543d 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb @@ -35,7 +35,7 @@ module Fog # def describe_notification_configurations(options = {}) if auto_scaling_group_names = options.delete('AutoScalingGroupNames') - options.merge!(Aws.indexed_param('AutoScalingGroupNames.member.%d', [*auto_scaling_group_names])) + options.merge!(AWS.indexed_param('AutoScalingGroupNames.member.%d', [*auto_scaling_group_names])) end request({ 'Action' => 'DescribeNotificationConfigurations', diff --git a/lib/fog/aws/requests/auto_scaling/describe_policies.rb b/lib/fog/aws/requests/auto_scaling/describe_policies.rb index fe7af0abd..c8fa2822c 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_policies.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_policies.rb @@ -60,7 +60,7 @@ module Fog # def describe_policies(options = {}) if policy_names = options.delete('PolicyNames') - options.merge!(Aws.indexed_param('PolicyNames.member.%d', [*policy_names])) + options.merge!(AWS.indexed_param('PolicyNames.member.%d', [*policy_names])) end request({ 'Action' => 'DescribePolicies', diff --git a/lib/fog/aws/requests/auto_scaling/describe_scaling_activities.rb b/lib/fog/aws/requests/auto_scaling/describe_scaling_activities.rb index a91a17abe..1673dd2c3 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_scaling_activities.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_scaling_activities.rb @@ -63,7 +63,7 @@ module Fog # def describe_scaling_activities(options = {}) if activity_ids = options.delete('ActivityIds') - options.merge!(Aws.indexed_param('ActivityIds.member.%d', [*activity_ids])) + options.merge!(AWS.indexed_param('ActivityIds.member.%d', [*activity_ids])) end request({ 'Action' => 'DescribeScalingActivities', diff --git a/lib/fog/aws/requests/auto_scaling/describe_scheduled_actions.rb b/lib/fog/aws/requests/auto_scaling/describe_scheduled_actions.rb index 5b4e52145..23b3504a2 100644 --- a/lib/fog/aws/requests/auto_scaling/describe_scheduled_actions.rb +++ b/lib/fog/aws/requests/auto_scaling/describe_scheduled_actions.rb @@ -63,7 +63,7 @@ module Fog # def describe_scheduled_actions(options = {}) if scheduled_action_names = options.delete('ScheduledActionNames') - options.merge!(Aws.indexed_param('ScheduledActionNames.member.%d', [*scheduled_action_names])) + options.merge!(AWS.indexed_param('ScheduledActionNames.member.%d', [*scheduled_action_names])) end request({ 'Action' => 'DescribeScheduledActions', diff --git a/lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb b/lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb index 13bb61b86..cdee75628 100644 --- a/lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb +++ b/lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb @@ -26,7 +26,7 @@ module Fog # def disable_metrics_collection(auto_scaling_group_name, options = {}) if metrics = options.delete('Metrics') - options.merge!(Aws.indexed_param('Metrics.member.%d', [*metrics])) + options.merge!(AWS.indexed_param('Metrics.member.%d', [*metrics])) end request({ 'Action' => 'DisableMetricsCollection', diff --git a/lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb b/lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb index 84fc35329..5fc414e1b 100644 --- a/lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb +++ b/lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb @@ -32,7 +32,7 @@ module Fog # def enable_metrics_collection(auto_scaling_group_name, granularity, options = {}) if metrics = options.delete('Metrics') - options.merge!(Aws.indexed_param('Metrics.member.%d', [*metrics])) + options.merge!(AWS.indexed_param('Metrics.member.%d', [*metrics])) end request({ 'Action' => 'EnableMetricsCollection', diff --git a/lib/fog/aws/requests/auto_scaling/put_notification_configuration.rb b/lib/fog/aws/requests/auto_scaling/put_notification_configuration.rb index 31f4eb304..0ba8c0132 100644 --- a/lib/fog/aws/requests/auto_scaling/put_notification_configuration.rb +++ b/lib/fog/aws/requests/auto_scaling/put_notification_configuration.rb @@ -25,7 +25,7 @@ module Fog # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_PutNotificationConfiguration.html # def put_notification_configuration(auto_scaling_group_name, notification_types, topic_arn) - params = Aws.indexed_param('NotificationTypes.member.%d', [*notification_types]) + params = AWS.indexed_param('NotificationTypes.member.%d', [*notification_types]) request({ 'Action' => 'PutNotificationConfiguration', 'AutoScalingGroupName' => auto_scaling_group_name, diff --git a/lib/fog/aws/requests/auto_scaling/resume_processes.rb b/lib/fog/aws/requests/auto_scaling/resume_processes.rb index 4df6a4715..0356221e0 100644 --- a/lib/fog/aws/requests/auto_scaling/resume_processes.rb +++ b/lib/fog/aws/requests/auto_scaling/resume_processes.rb @@ -24,7 +24,7 @@ module Fog # def resume_processes(auto_scaling_group_name, options = {}) if scaling_processes = options.delete('ScalingProcesses') - options.merge!(Aws.indexed_param('ScalingProcesses.member.%d', [*scaling_processes])) + options.merge!(AWS.indexed_param('ScalingProcesses.member.%d', [*scaling_processes])) end request({ 'Action' => 'ResumeProcesses', diff --git a/lib/fog/aws/requests/auto_scaling/suspend_processes.rb b/lib/fog/aws/requests/auto_scaling/suspend_processes.rb index 78424fd8d..7dcd419de 100644 --- a/lib/fog/aws/requests/auto_scaling/suspend_processes.rb +++ b/lib/fog/aws/requests/auto_scaling/suspend_processes.rb @@ -27,7 +27,7 @@ module Fog # def suspend_processes(auto_scaling_group_name, options = {}) if scaling_processes = options.delete('ScalingProcesses') - options.merge!(Aws.indexed_param('ScalingProcesses.member.%d', [*scaling_processes])) + options.merge!(AWS.indexed_param('ScalingProcesses.member.%d', [*scaling_processes])) end request({ 'Action' => 'SuspendProcesses', diff --git a/lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb b/lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb index 48eee8c4f..5a53fc86c 100644 --- a/lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb +++ b/lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb @@ -55,10 +55,10 @@ module Fog def update_auto_scaling_group(auto_scaling_group_name, options = {}) if availability_zones = options.delete('AvailabilityZones') - options.merge!(Aws.indexed_param('AvailabilityZones.member.%d', [*availability_zones])) + options.merge!(AWS.indexed_param('AvailabilityZones.member.%d', [*availability_zones])) end if termination_policies = options.delete('TerminationPolicies') - options.merge!(Aws.indexed_param('TerminationPolicies.member.%d', [*termination_policies])) + options.merge!(AWS.indexed_param('TerminationPolicies.member.%d', [*termination_policies])) end request({ 'Action' => 'UpdateAutoScalingGroup', diff --git a/lib/fog/aws/requests/beanstalk/create_configuration_template.rb b/lib/fog/aws/requests/beanstalk/create_configuration_template.rb index 18c103991..d4adc4ff6 100644 --- a/lib/fog/aws/requests/beanstalk/create_configuration_template.rb +++ b/lib/fog/aws/requests/beanstalk/create_configuration_template.rb @@ -9,16 +9,16 @@ module Fog # # ==== Options # * ApplicationName<~String>: The name of the application to associate with this configuration template. - # If no application is found with this name, Aws Elastic Beanstalk returns an InvalidParameterValue error. + # If no application is found with this name, AWS Elastic Beanstalk returns an InvalidParameterValue error. # * Description<~String>: Describes this configuration. # * EnvironmentId<~String>: The ID of the environment used with this configuration template. - # * OptionSettings<~Hash>: If specified, Aws Elastic Beanstalk sets the specified configuration option + # * OptionSettings<~Hash>: If specified, AWS Elastic Beanstalk sets the specified configuration option # to the requested value. The new value overrides the value obtained from the solution stack or the # source configuration template. # * SolutionStackName<~String>: The name of the solution stack used by this configuration. The solution # stack specifies the operating system, architecture, and application server for a configuration template. # It determines the set of configuration options as well as the possible and default values. - # * SourceConfiguration<~String>: If specified, Aws Elastic Beanstalk uses the configuration values from the + # * SourceConfiguration<~String>: If specified, AWS Elastic Beanstalk uses the configuration values from the # specified configuration template to create a new configuration. # * TemplateName<~String>: The name of the configuration template. # @@ -30,10 +30,10 @@ module Fog # def create_configuration_template(options={}) if option_settings = options.delete('OptionSettings') - options.merge!(Aws.indexed_param('OptionSettings.member.%d', [*option_settings])) + options.merge!(AWS.indexed_param('OptionSettings.member.%d', [*option_settings])) end if option_settings = options.delete('SourceConfiguration') - options.merge!(Aws.serialize_keys('SourceConfiguration', option_settings)) + options.merge!(AWS.serialize_keys('SourceConfiguration', option_settings)) end request({ 'Operation' => 'CreateConfigurationTemplate', diff --git a/lib/fog/aws/requests/beanstalk/create_environment.rb b/lib/fog/aws/requests/beanstalk/create_environment.rb index 0a77b5b69..cbf3e9405 100644 --- a/lib/fog/aws/requests/beanstalk/create_environment.rb +++ b/lib/fog/aws/requests/beanstalk/create_environment.rb @@ -7,22 +7,22 @@ module Fog # Launches an environment for the specified application using the specified configuration. # # ==== Options - # * ApplicationName<~String>: If specified, Aws Elastic Beanstalk restricts the returned descriptions + # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions # to include only those that are associated with this application. # * CNAMEPrefix<~String>: If specified, the environment attempts to use this value as the prefix for the CNAME. # If not specified, the environment uses the environment name. # * Description<~String>: Describes this environment. # * EnvironmentName<~String>: A unique name for the deployment environment. Used in the application URL. - # * OptionSettings<~Array>: If specified, Aws Elastic Beanstalk sets the specified configuration options to + # * OptionSettings<~Array>: If specified, AWS Elastic Beanstalk sets the specified configuration options to # the requested value in the configuration set for the new environment. These override the values obtained # from the solution stack or the configuration template. # * OptionsToRemove<~Array>: A list of custom user-defined configuration options to remove from the # configuration set for this new environment. # * SolutionStackName<~String>: This is an alternative to specifying a configuration name. If specified, - # Aws Elastic Beanstalk sets the configuration values to the default values associated with the + # AWS Elastic Beanstalk sets the configuration values to the default values associated with the # specified solution stack. # * TemplateName<~String>: The name of the configuration template to use in deployment. If no configuration - # template is found with this name, Aws Elastic Beanstalk returns an InvalidParameterValue error. + # template is found with this name, AWS Elastic Beanstalk returns an InvalidParameterValue error. # * VersionLabel<~String>: The name of the application version to deploy. # # ==== Returns @@ -33,10 +33,10 @@ module Fog # def create_environment(options={}) if option_settings = options.delete('OptionSettings') - options.merge!(Aws.indexed_param('OptionSettings.member.%d', [*option_settings])) + options.merge!(AWS.indexed_param('OptionSettings.member.%d', [*option_settings])) end if options_to_remove = options.delete('OptionsToRemove') - options.merge!(Aws.indexed_param('OptionsToRemove.member.%d', [*options_to_remove])) + options.merge!(AWS.indexed_param('OptionsToRemove.member.%d', [*options_to_remove])) end request({ 'Operation' => 'CreateEnvironment', diff --git a/lib/fog/aws/requests/beanstalk/describe_application_versions.rb b/lib/fog/aws/requests/beanstalk/describe_application_versions.rb index 7eda21282..b23fa74b9 100644 --- a/lib/fog/aws/requests/beanstalk/describe_application_versions.rb +++ b/lib/fog/aws/requests/beanstalk/describe_application_versions.rb @@ -7,7 +7,7 @@ module Fog # Returns descriptions for existing application versions. # # ==== Options - # * ApplicationName<~String>: If specified, Aws Elastic Beanstalk restricts the returned descriptions to + # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions to # only include ones that are associated with the specified application. # * VersionLabels<~Array>: If specified, restricts the returned descriptions to only include ones that have # the specified version labels. @@ -20,7 +20,7 @@ module Fog # def describe_application_versions(options={}) if version_labels = options.delete('VersionLabels') - options.merge!(Aws.indexed_param('VersionLabels.member.%d', [*version_labels])) + options.merge!(AWS.indexed_param('VersionLabels.member.%d', [*version_labels])) end request({ 'Operation' => 'DescribeApplicationVersions', diff --git a/lib/fog/aws/requests/beanstalk/describe_applications.rb b/lib/fog/aws/requests/beanstalk/describe_applications.rb index 4079557cd..28f6e8514 100644 --- a/lib/fog/aws/requests/beanstalk/describe_applications.rb +++ b/lib/fog/aws/requests/beanstalk/describe_applications.rb @@ -7,7 +7,7 @@ module Fog # Returns the descriptions of existing applications. # # ==== Options - # * application_names<~Array>: If specified, Aws Elastic Beanstalk restricts the returned descriptions + # * application_names<~Array>: If specified, AWS Elastic Beanstalk restricts the returned descriptions # to only include those with the specified names. # ==== Returns # * response<~Excon::Response>: @@ -17,7 +17,7 @@ module Fog # def describe_applications(application_names=[]) options = {} - options.merge!(Aws.indexed_param('ApplicationNames.member.%d', [*application_names])) + options.merge!(AWS.indexed_param('ApplicationNames.member.%d', [*application_names])) request({ 'Operation' => 'DescribeApplications', :parser => Fog::Parsers::AWS::ElasticBeanstalk::DescribeApplications.new diff --git a/lib/fog/aws/requests/beanstalk/describe_configuration_options.rb b/lib/fog/aws/requests/beanstalk/describe_configuration_options.rb index 61b4baabc..61b942d7d 100644 --- a/lib/fog/aws/requests/beanstalk/describe_configuration_options.rb +++ b/lib/fog/aws/requests/beanstalk/describe_configuration_options.rb @@ -26,7 +26,7 @@ module Fog # def describe_configuration_options(options={}) if option_filters = options.delete('Options') - options.merge!(Aws.indexed_param('Options.member.%d', [*option_filters])) + options.merge!(AWS.indexed_param('Options.member.%d', [*option_filters])) end request({ 'Operation' => 'DescribeConfigurationOptions', diff --git a/lib/fog/aws/requests/beanstalk/describe_environment_resources.rb b/lib/fog/aws/requests/beanstalk/describe_environment_resources.rb index b64797bd9..3ee68524f 100644 --- a/lib/fog/aws/requests/beanstalk/describe_environment_resources.rb +++ b/lib/fog/aws/requests/beanstalk/describe_environment_resources.rb @@ -4,7 +4,7 @@ module Fog class Real require 'fog/aws/parsers/beanstalk/describe_environment_resources' - # Returns Aws resources for this environment. + # Returns AWS resources for this environment. # # ==== Options # * EnvironmentId diff --git a/lib/fog/aws/requests/beanstalk/describe_environments.rb b/lib/fog/aws/requests/beanstalk/describe_environments.rb index d83bb6b16..e0c573352 100644 --- a/lib/fog/aws/requests/beanstalk/describe_environments.rb +++ b/lib/fog/aws/requests/beanstalk/describe_environments.rb @@ -7,7 +7,7 @@ module Fog # Returns descriptions for existing environments. # # ==== Options - # * ApplicationName<~String>: If specified, Aws Elastic Beanstalk restricts the returned descriptions + # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions # to include only those that are associated with this application. # * EnvironmentIds # * EnvironmentNames @@ -23,10 +23,10 @@ module Fog # def describe_environments(options={}) if environment_ids = options.delete('EnvironmentIds') - options.merge!(Aws.indexed_param('EnvironmentIds.member.%d', [*environment_ids])) + options.merge!(AWS.indexed_param('EnvironmentIds.member.%d', [*environment_ids])) end if environment_names = options.delete('EnvironmentNames') - options.merge!(Aws.indexed_param('EnvironmentNames.member.%d', [*environment_names])) + options.merge!(AWS.indexed_param('EnvironmentNames.member.%d', [*environment_names])) end request({ 'Operation' => 'DescribeEnvironments', diff --git a/lib/fog/aws/requests/beanstalk/describe_events.rb b/lib/fog/aws/requests/beanstalk/describe_events.rb index 3a3efeef2..ebbe7723c 100644 --- a/lib/fog/aws/requests/beanstalk/describe_events.rb +++ b/lib/fog/aws/requests/beanstalk/describe_events.rb @@ -7,7 +7,7 @@ module Fog # Returns list of event descriptions matching criteria up to the last 6 weeks. # # ==== Options - # * ApplicationName<~String>: If specified, Aws Elastic Beanstalk restricts the returned descriptions + # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions # to include only those that are associated with this application. # # ==== Returns diff --git a/lib/fog/aws/requests/beanstalk/rebuild_environment.rb b/lib/fog/aws/requests/beanstalk/rebuild_environment.rb index 8a2d4783c..e72290042 100644 --- a/lib/fog/aws/requests/beanstalk/rebuild_environment.rb +++ b/lib/fog/aws/requests/beanstalk/rebuild_environment.rb @@ -4,7 +4,7 @@ module Fog class Real require 'fog/aws/parsers/beanstalk/empty' - # Deletes and recreates all of the Aws resources (for example: the Auto Scaling group, load balancer, etc.) + # Deletes and recreates all of the AWS resources (for example: the Auto Scaling group, load balancer, etc.) # for a specified environment and forces a restart. # # ==== Options diff --git a/lib/fog/aws/requests/beanstalk/request_environment_info.rb b/lib/fog/aws/requests/beanstalk/request_environment_info.rb index 0385fd30f..ea48d2ea6 100644 --- a/lib/fog/aws/requests/beanstalk/request_environment_info.rb +++ b/lib/fog/aws/requests/beanstalk/request_environment_info.rb @@ -4,7 +4,7 @@ module Fog class Real require 'fog/aws/parsers/beanstalk/empty' - # Returns Aws resources for this environment. + # Returns AWS resources for this environment. # # ==== Options # * EnvironmentId diff --git a/lib/fog/aws/requests/beanstalk/restart_app_server.rb b/lib/fog/aws/requests/beanstalk/restart_app_server.rb index 401cfed39..e5180a2c3 100644 --- a/lib/fog/aws/requests/beanstalk/restart_app_server.rb +++ b/lib/fog/aws/requests/beanstalk/restart_app_server.rb @@ -4,7 +4,7 @@ module Fog class Real require 'fog/aws/parsers/beanstalk/empty' - # Returns Aws resources for this environment. + # Returns AWS resources for this environment. # # ==== Options # * EnvironmentId diff --git a/lib/fog/aws/requests/beanstalk/retrieve_environment_info.rb b/lib/fog/aws/requests/beanstalk/retrieve_environment_info.rb index 9165c9f5d..f13904281 100644 --- a/lib/fog/aws/requests/beanstalk/retrieve_environment_info.rb +++ b/lib/fog/aws/requests/beanstalk/retrieve_environment_info.rb @@ -4,7 +4,7 @@ module Fog class Real require 'fog/aws/parsers/beanstalk/retrieve_environment_info' - # Returns Aws resources for this environment. + # Returns AWS resources for this environment. # # ==== Options # * EnvironmentId diff --git a/lib/fog/aws/requests/beanstalk/terminate_environment.rb b/lib/fog/aws/requests/beanstalk/terminate_environment.rb index b7e01baf4..ebf250731 100644 --- a/lib/fog/aws/requests/beanstalk/terminate_environment.rb +++ b/lib/fog/aws/requests/beanstalk/terminate_environment.rb @@ -9,7 +9,7 @@ module Fog # ==== Options # * EnvironmentId<~String>: The ID of the environment to terminate. # * EnvironmentName<~String>: The name of the environment to terminate. - # * TerminateResources<~Boolean>: Indicates whether the associated Aws resources should shut down when the + # * TerminateResources<~Boolean>: Indicates whether the associated AWS resources should shut down when the # environment is terminated # # ==== Returns diff --git a/lib/fog/aws/requests/beanstalk/update_configuration_template.rb b/lib/fog/aws/requests/beanstalk/update_configuration_template.rb index e69468d66..6cca4d10f 100644 --- a/lib/fog/aws/requests/beanstalk/update_configuration_template.rb +++ b/lib/fog/aws/requests/beanstalk/update_configuration_template.rb @@ -7,7 +7,7 @@ module Fog # Updates the specified configuration template to have the specified properties or configuration option values. # # ==== Options - # * ApplicationName<~String>: If specified, Aws Elastic Beanstalk restricts the returned descriptions + # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions # to include only those that are associated with this application. # * VersionLabel<~String>: # @@ -19,10 +19,10 @@ module Fog # def update_configuration_template(options={}) if option_settings = options.delete('OptionSettings') - options.merge!(Aws.indexed_param('OptionSettings.member.%d', [*option_settings])) + options.merge!(AWS.indexed_param('OptionSettings.member.%d', [*option_settings])) end if options_to_remove = options.delete('OptionsToRemove') - options.merge!(Aws.indexed_param('OptionsToRemove.member.%d', [*options_to_remove])) + options.merge!(AWS.indexed_param('OptionsToRemove.member.%d', [*options_to_remove])) end request({ 'Operation' => 'UpdateConfigurationTemplate', diff --git a/lib/fog/aws/requests/beanstalk/update_environment.rb b/lib/fog/aws/requests/beanstalk/update_environment.rb index d41216af9..f9f80fa27 100644 --- a/lib/fog/aws/requests/beanstalk/update_environment.rb +++ b/lib/fog/aws/requests/beanstalk/update_environment.rb @@ -9,7 +9,7 @@ module Fog # the running environment. # # ==== Options - # * ApplicationName<~String>: If specified, Aws Elastic Beanstalk restricts the returned descriptions + # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions # to include only those that are associated with this application. # * EnvironmentIds # * EnvironmentNames @@ -25,10 +25,10 @@ module Fog # def update_environment(options={}) if option_settings = options.delete('OptionSettings') - options.merge!(Aws.indexed_param('OptionSettings.member.%d', [*option_settings])) + options.merge!(AWS.indexed_param('OptionSettings.member.%d', [*option_settings])) end if options_to_remove = options.delete('OptionsToRemove') - options.merge!(Aws.indexed_param('OptionsToRemove.member.%d', [*options_to_remove])) + options.merge!(AWS.indexed_param('OptionsToRemove.member.%d', [*options_to_remove])) end request({ 'Operation' => 'UpdateEnvironment', diff --git a/lib/fog/aws/requests/beanstalk/validate_configuration_settings.rb b/lib/fog/aws/requests/beanstalk/validate_configuration_settings.rb index 9be57f3ee..466ba0b82 100644 --- a/lib/fog/aws/requests/beanstalk/validate_configuration_settings.rb +++ b/lib/fog/aws/requests/beanstalk/validate_configuration_settings.rb @@ -7,7 +7,7 @@ module Fog # Updates the specified configuration template to have the specified properties or configuration option values. # # ==== Options - # * ApplicationName<~String>: If specified, Aws Elastic Beanstalk restricts the returned descriptions + # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions # to include only those that are associated with this application. # * VersionLabel<~String>: # @@ -19,7 +19,7 @@ module Fog # def validate_configuration_settings(options={}) if option_settings = options.delete('OptionSettings') - options.merge!(Aws.indexed_param('OptionSettings.member.%d', [*option_settings])) + options.merge!(AWS.indexed_param('OptionSettings.member.%d', [*option_settings])) end request({ 'Operation' => 'ValidateConfigurationSettings', diff --git a/lib/fog/aws/requests/cdn/delete_distribution.rb b/lib/fog/aws/requests/cdn/delete_distribution.rb index 4458cc8ad..01b964750 100644 --- a/lib/fog/aws/requests/cdn/delete_distribution.rb +++ b/lib/fog/aws/requests/cdn/delete_distribution.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real # Delete a distribution from CloudFront. # diff --git a/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb b/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb index 5e4174524..143705522 100644 --- a/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb +++ b/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real # Delete a streaming distribution from CloudFront. # diff --git a/lib/fog/aws/requests/cdn/get_distribution.rb b/lib/fog/aws/requests/cdn/get_distribution.rb index 1d37158f9..5061cb7fd 100644 --- a/lib/fog/aws/requests/cdn/get_distribution.rb +++ b/lib/fog/aws/requests/cdn/get_distribution.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/distribution' diff --git a/lib/fog/aws/requests/cdn/get_distribution_list.rb b/lib/fog/aws/requests/cdn/get_distribution_list.rb index e23e3e09e..80e28e0be 100644 --- a/lib/fog/aws/requests/cdn/get_distribution_list.rb +++ b/lib/fog/aws/requests/cdn/get_distribution_list.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/get_distribution_list' diff --git a/lib/fog/aws/requests/cdn/get_invalidation.rb b/lib/fog/aws/requests/cdn/get_invalidation.rb index 8b03d6cf8..f1ec500e2 100644 --- a/lib/fog/aws/requests/cdn/get_invalidation.rb +++ b/lib/fog/aws/requests/cdn/get_invalidation.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/get_invalidation' diff --git a/lib/fog/aws/requests/cdn/get_invalidation_list.rb b/lib/fog/aws/requests/cdn/get_invalidation_list.rb index 9a9a26ee6..f0f4eb255 100644 --- a/lib/fog/aws/requests/cdn/get_invalidation_list.rb +++ b/lib/fog/aws/requests/cdn/get_invalidation_list.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/get_invalidation_list' diff --git a/lib/fog/aws/requests/cdn/get_streaming_distribution.rb b/lib/fog/aws/requests/cdn/get_streaming_distribution.rb index 8e8c6c973..b212af16c 100644 --- a/lib/fog/aws/requests/cdn/get_streaming_distribution.rb +++ b/lib/fog/aws/requests/cdn/get_streaming_distribution.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/streaming_distribution' diff --git a/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb b/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb index 148da3ced..806de70ba 100644 --- a/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb +++ b/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/get_streaming_distribution_list' diff --git a/lib/fog/aws/requests/cdn/post_distribution.rb b/lib/fog/aws/requests/cdn/post_distribution.rb index 45334931e..98b8efd5e 100644 --- a/lib/fog/aws/requests/cdn/post_distribution.rb +++ b/lib/fog/aws/requests/cdn/post_distribution.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/distribution' @@ -29,7 +29,7 @@ module Fog # * Prefix [String] Optional prefix for log filenames, ie 'myprefix/'. # * OriginAccessIdentity [String] Used for serving private content, in format 'origin-access-identity/cloudfront/ID'. # * RequiredProtocols [String] Optional, set to 'https' to force https connections. - # * TrustedSigners [Array] Optional grant of rights to up to 5 aws accounts to generate signed URLs for private content, elements are either 'Self' for your own account or an Aws Account Number. + # * TrustedSigners [Array] Optional grant of rights to up to 5 aws accounts to generate signed URLs for private content, elements are either 'Self' for your own account or an AWS Account Number. # # @return [Excon::Response] # * body [Hash]: diff --git a/lib/fog/aws/requests/cdn/post_invalidation.rb b/lib/fog/aws/requests/cdn/post_invalidation.rb index 50e7ff908..36bef96f6 100644 --- a/lib/fog/aws/requests/cdn/post_invalidation.rb +++ b/lib/fog/aws/requests/cdn/post_invalidation.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/post_invalidation' diff --git a/lib/fog/aws/requests/cdn/post_streaming_distribution.rb b/lib/fog/aws/requests/cdn/post_streaming_distribution.rb index 811279138..4477a2a89 100644 --- a/lib/fog/aws/requests/cdn/post_streaming_distribution.rb +++ b/lib/fog/aws/requests/cdn/post_streaming_distribution.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/streaming_distribution' diff --git a/lib/fog/aws/requests/cdn/put_distribution_config.rb b/lib/fog/aws/requests/cdn/put_distribution_config.rb index 2a230b35d..71d828631 100644 --- a/lib/fog/aws/requests/cdn/put_distribution_config.rb +++ b/lib/fog/aws/requests/cdn/put_distribution_config.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/distribution' @@ -30,7 +30,7 @@ module Fog # * Prefix [String] Optional prefix for log filenames, ie 'myprefix/'. # * OriginAccessIdentity [String] Used for serving private content, in format 'origin-access-identity/cloudfront/ID'. # * RequiredProtocols [String] Optional, set to 'https' to force https connections. - # * TrustedSigners [Array] Optional grant of rights to up to 5 aws accounts to generate signed URLs for private content, elements are either 'Self' for your own account or an Aws Account Number. + # * TrustedSigners [Array] Optional grant of rights to up to 5 aws accounts to generate signed URLs for private content, elements are either 'Self' for your own account or an AWS Account Number. # # @return [Excon::Response] # * body [Hash]: diff --git a/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb b/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb index 82740e5f4..bb6d2a597 100644 --- a/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb +++ b/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb @@ -1,6 +1,6 @@ module Fog module CDN - class Aws + class AWS class Real require 'fog/aws/parsers/cdn/streaming_distribution' diff --git a/lib/fog/aws/requests/cloud_formation/create_stack.rb b/lib/fog/aws/requests/cloud_formation/create_stack.rb index 6cc8f657a..fd7dea14f 100644 --- a/lib/fog/aws/requests/cloud_formation/create_stack.rb +++ b/lib/fog/aws/requests/cloud_formation/create_stack.rb @@ -21,7 +21,7 @@ module Fog # * body [Hash: # * StackId [String] - Id of the new stack # - # @see http://docs.amazonwebservices.com/AwsCloudFormation/latest/APIReference/API_CreateStack.html + # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_CreateStack.html def create_stack(stack_name, options = {}) params = { diff --git a/lib/fog/aws/requests/cloud_formation/delete_stack.rb b/lib/fog/aws/requests/cloud_formation/delete_stack.rb index a16166c2a..6fd982457 100644 --- a/lib/fog/aws/requests/cloud_formation/delete_stack.rb +++ b/lib/fog/aws/requests/cloud_formation/delete_stack.rb @@ -10,7 +10,7 @@ module Fog # # @return [Excon::Response] # - # @see http://docs.amazonwebservices.com/AwsCloudFormation/latest/APIReference/API_DeleteStack.html + # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DeleteStack.html def delete_stack(stack_name) request( diff --git a/lib/fog/aws/requests/cloud_formation/describe_stack_events.rb b/lib/fog/aws/requests/cloud_formation/describe_stack_events.rb index 5ef2c3d34..32ce57c81 100644 --- a/lib/fog/aws/requests/cloud_formation/describe_stack_events.rb +++ b/lib/fog/aws/requests/cloud_formation/describe_stack_events.rb @@ -24,7 +24,7 @@ module Fog # * ResourceStatus [String] - # * ResourceStatusReason [String] - # - # @see http://docs.amazonwebservices.com/AwsCloudFormation/latest/APIReference/API_DescribeStackEvents.html + # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DescribeStackEvents.html def describe_stack_events(stack_name, options = {}) request({ diff --git a/lib/fog/aws/requests/cloud_formation/describe_stack_resources.rb b/lib/fog/aws/requests/cloud_formation/describe_stack_resources.rb index 8c9ddeb05..73ca74882 100644 --- a/lib/fog/aws/requests/cloud_formation/describe_stack_resources.rb +++ b/lib/fog/aws/requests/cloud_formation/describe_stack_resources.rb @@ -24,7 +24,7 @@ module Fog # * Timestamp [Time] - # * ResourceStatus [String] - # - # @see http://docs.amazonwebservices.com/AwsCloudFormation/latest/APIReference/API_DescribeStackResources.html + # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DescribeStackResources.html def describe_stack_resources(options = {}) request({ diff --git a/lib/fog/aws/requests/cloud_formation/describe_stacks.rb b/lib/fog/aws/requests/cloud_formation/describe_stacks.rb index 4ed91adf2..d5d30668f 100644 --- a/lib/fog/aws/requests/cloud_formation/describe_stacks.rb +++ b/lib/fog/aws/requests/cloud_formation/describe_stacks.rb @@ -23,7 +23,7 @@ module Fog # * OutputKey [String] - # * OutputValue [String] - # - # @see http://docs.amazonwebservices.com/AwsCloudFormation/latest/APIReference/API_DescribeStacks.html + # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DescribeStacks.html def describe_stacks(options = {}) request({ diff --git a/lib/fog/aws/requests/cloud_formation/get_template.rb b/lib/fog/aws/requests/cloud_formation/get_template.rb index ce5c25f41..918203f05 100644 --- a/lib/fog/aws/requests/cloud_formation/get_template.rb +++ b/lib/fog/aws/requests/cloud_formation/get_template.rb @@ -12,7 +12,7 @@ module Fog # * body [Hash]: # * TemplateBody [String] - structure containing the template body (json) # - # @see http://docs.amazonwebservices.com/AwsCloudFormation/latest/APIReference/API_GetTemplate.html + # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_GetTemplate.html def get_template(stack_name) request( diff --git a/lib/fog/aws/requests/cloud_formation/list_stack_resources.rb b/lib/fog/aws/requests/cloud_formation/list_stack_resources.rb index 19cbdcc82..ba8d0b14e 100644 --- a/lib/fog/aws/requests/cloud_formation/list_stack_resources.rb +++ b/lib/fog/aws/requests/cloud_formation/list_stack_resources.rb @@ -20,7 +20,7 @@ module Fog # * LastUpdatedTimestamp [Time] - # # - # @see http://docs.aws.amazon.com/AwsCloudFormation/latest/APIReference/API_ListStacks.html + # @see http://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ListStacks.html def list_stack_resources(options = {}) request({ diff --git a/lib/fog/aws/requests/cloud_formation/list_stacks.rb b/lib/fog/aws/requests/cloud_formation/list_stacks.rb index eb5c7fab2..1587f2a29 100644 --- a/lib/fog/aws/requests/cloud_formation/list_stacks.rb +++ b/lib/fog/aws/requests/cloud_formation/list_stacks.rb @@ -21,7 +21,7 @@ module Fog # * DeletionTime [String] - # # - # @see http://docs.aws.amazon.com/AwsCloudFormation/latest/APIReference/API_ListStacks.html + # @see http://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ListStacks.html def list_stacks(options = {}) request({ diff --git a/lib/fog/aws/requests/cloud_formation/update_stack.rb b/lib/fog/aws/requests/cloud_formation/update_stack.rb index 75827852a..d3722498c 100644 --- a/lib/fog/aws/requests/cloud_formation/update_stack.rb +++ b/lib/fog/aws/requests/cloud_formation/update_stack.rb @@ -18,7 +18,7 @@ module Fog # * body [Hash]: # * StackId [String] - Id of the stack being updated # - # @see http://docs.amazonwebservices.com/AwsCloudFormation/latest/APIReference/API_UpdateStack.html + # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_UpdateStack.html # def update_stack(stack_name, options = {}) params = { diff --git a/lib/fog/aws/requests/cloud_formation/validate_template.rb b/lib/fog/aws/requests/cloud_formation/validate_template.rb index c403f7945..b16911c92 100644 --- a/lib/fog/aws/requests/cloud_formation/validate_template.rb +++ b/lib/fog/aws/requests/cloud_formation/validate_template.rb @@ -15,7 +15,7 @@ module Fog # * Description [String] - description found within the template # * Parameters [String] - list of template parameter structures # - # @see http://docs.amazonwebservices.com/AwsCloudFormation/latest/APIReference/API_ValidateTemplate.html + # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_ValidateTemplate.html # def validate_template(options = {}) request({ diff --git a/lib/fog/aws/requests/cloud_watch/delete_alarms.rb b/lib/fog/aws/requests/cloud_watch/delete_alarms.rb index 0de271dfa..3784e1eeb 100644 --- a/lib/fog/aws/requests/cloud_watch/delete_alarms.rb +++ b/lib/fog/aws/requests/cloud_watch/delete_alarms.rb @@ -17,7 +17,7 @@ module Fog def delete_alarms(alarm_names) options = {} - options.merge!(Aws.indexed_param('AlarmNames.member.%d', [*alarm_names])) + options.merge!(AWS.indexed_param('AlarmNames.member.%d', [*alarm_names])) request({ 'Action' => 'DeleteAlarms', :parser => Fog::Parsers::AWS::CloudWatch::DeleteAlarms.new diff --git a/lib/fog/aws/requests/cloud_watch/describe_alarms.rb b/lib/fog/aws/requests/cloud_watch/describe_alarms.rb index a19ed605b..ecd7884c7 100644 --- a/lib/fog/aws/requests/cloud_watch/describe_alarms.rb +++ b/lib/fog/aws/requests/cloud_watch/describe_alarms.rb @@ -24,7 +24,7 @@ module Fog def describe_alarms(options={}) if alarm_names = options.delete('AlarmNames') - options.merge!(Aws.indexed_param('AlarmNames.member.%d', [*alarm_names])) + options.merge!(AWS.indexed_param('AlarmNames.member.%d', [*alarm_names])) end request({ 'Action' => 'DescribeAlarms', diff --git a/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb b/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb index 551359675..e8c4179cb 100644 --- a/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb +++ b/lib/fog/aws/requests/cloud_watch/describe_alarms_for_metric.rb @@ -24,8 +24,8 @@ module Fog def describe_alarms_for_metric(options) if dimensions = options.delete('Dimensions') - options.merge!(Aws.indexed_param('Dimensions.member.%d.Name', dimensions.map {|dimension| dimension['Name']})) - options.merge!(Aws.indexed_param('Dimensions.member.%d.Value', dimensions.map {|dimension| dimension['Value']})) + options.merge!(AWS.indexed_param('Dimensions.member.%d.Name', dimensions.map {|dimension| dimension['Name']})) + options.merge!(AWS.indexed_param('Dimensions.member.%d.Value', dimensions.map {|dimension| dimension['Value']})) end request({ 'Action' => 'DescribeAlarmsForMetric', diff --git a/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb b/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb index 518537f46..26ea6d074 100644 --- a/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb +++ b/lib/fog/aws/requests/cloud_watch/disable_alarm_actions.rb @@ -17,7 +17,7 @@ module Fog def disable_alarm_actions(alarm_names) options = {} - options.merge!(Aws.indexed_param('AlarmNames.member.%d', [*alarm_names])) + options.merge!(AWS.indexed_param('AlarmNames.member.%d', [*alarm_names])) request({ 'Action' => 'DisableAlarmActions', :parser => Fog::Parsers::AWS::CloudWatch::DisableAlarmActions.new diff --git a/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb b/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb index d0135d484..1d229cc6a 100644 --- a/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb +++ b/lib/fog/aws/requests/cloud_watch/enable_alarm_actions.rb @@ -17,7 +17,7 @@ module Fog def enable_alarm_actions(alarm_names) options = {} - options.merge!(Aws.indexed_param('AlarmNames.member.%d', [*alarm_names])) + options.merge!(AWS.indexed_param('AlarmNames.member.%d', [*alarm_names])) request({ 'Action' => 'EnableAlarmActions', :parser => Fog::Parsers::AWS::CloudWatch::EnableAlarmActions.new diff --git a/lib/fog/aws/requests/cloud_watch/get_metric_statistics.rb b/lib/fog/aws/requests/cloud_watch/get_metric_statistics.rb index 3ec18f2f2..dbfcfef7d 100644 --- a/lib/fog/aws/requests/cloud_watch/get_metric_statistics.rb +++ b/lib/fog/aws/requests/cloud_watch/get_metric_statistics.rb @@ -28,11 +28,11 @@ module Fog raise ArgumentError, "Must provide #{required_parameter}" unless options.key?(required_parameter) end statistics = options.delete 'Statistics' - options.merge!(Aws.indexed_param('Statistics.member.%d', [*statistics])) + options.merge!(AWS.indexed_param('Statistics.member.%d', [*statistics])) if dimensions = options.delete('Dimensions') - options.merge!(Aws.indexed_param('Dimensions.member.%d.Name', dimensions.map {|dimension| dimension['Name']})) - options.merge!(Aws.indexed_param('Dimensions.member.%d.Value', dimensions.map {|dimension| dimension['Value']})) + options.merge!(AWS.indexed_param('Dimensions.member.%d.Name', dimensions.map {|dimension| dimension['Name']})) + options.merge!(AWS.indexed_param('Dimensions.member.%d.Value', dimensions.map {|dimension| dimension['Value']})) end request({ diff --git a/lib/fog/aws/requests/cloud_watch/list_metrics.rb b/lib/fog/aws/requests/cloud_watch/list_metrics.rb index 4c448dd6b..de78214fb 100644 --- a/lib/fog/aws/requests/cloud_watch/list_metrics.rb +++ b/lib/fog/aws/requests/cloud_watch/list_metrics.rb @@ -21,8 +21,8 @@ module Fog # def list_metrics(options={}) if dimensions = options.delete('Dimensions') - options.merge!(Aws.indexed_param('Dimensions.member.%d.Name', dimensions.map {|dimension| dimension['Name']})) - options.merge!(Aws.indexed_param('Dimensions.member.%d.Value', dimensions.map {|dimension| dimension['Value']})) + options.merge!(AWS.indexed_param('Dimensions.member.%d.Name', dimensions.map {|dimension| dimension['Name']})) + options.merge!(AWS.indexed_param('Dimensions.member.%d.Value', dimensions.map {|dimension| dimension['Value']})) end request({ diff --git a/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb b/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb index 2f20e9cb3..f15979006 100644 --- a/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb +++ b/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb @@ -32,17 +32,17 @@ module Fog # def put_metric_alarm(options) if dimensions = options.delete('Dimensions') - options.merge!(Aws.indexed_param('Dimensions.member.%d.Name', dimensions.map {|dimension| dimension['Name']})) - options.merge!(Aws.indexed_param('Dimensions.member.%d.Value', dimensions.map {|dimension| dimension['Value']})) + options.merge!(AWS.indexed_param('Dimensions.member.%d.Name', dimensions.map {|dimension| dimension['Name']})) + options.merge!(AWS.indexed_param('Dimensions.member.%d.Value', dimensions.map {|dimension| dimension['Value']})) end if alarm_actions = options.delete('AlarmActions') - options.merge!(Aws.indexed_param('AlarmActions.member.%d', [*alarm_actions])) + options.merge!(AWS.indexed_param('AlarmActions.member.%d', [*alarm_actions])) end if insufficient_data_actions = options.delete('InsufficientDataActions') - options.merge!(Aws.indexed_param('InsufficientDataActions.member.%d', [*insufficient_data_actions])) + options.merge!(AWS.indexed_param('InsufficientDataActions.member.%d', [*insufficient_data_actions])) end if ok_actions = options.delete('OKActions') - options.merge!(Aws.indexed_param('OKActions.member.%d', [*ok_actions])) + options.merge!(AWS.indexed_param('OKActions.member.%d', [*ok_actions])) end request({ diff --git a/lib/fog/aws/requests/cloud_watch/put_metric_data.rb b/lib/fog/aws/requests/cloud_watch/put_metric_data.rb index 746e81986..9996e14ed 100644 --- a/lib/fog/aws/requests/cloud_watch/put_metric_data.rb +++ b/lib/fog/aws/requests/cloud_watch/put_metric_data.rb @@ -33,15 +33,15 @@ module Fog #first index the dimensions for any of the datums that have dimensions metric_data.map! do |metric_datum| if dimensions = metric_datum.delete('Dimensions') - metric_datum.merge!(Aws.indexed_param('Dimensions.member.%d.Name', dimensions.map {|dimension| dimension['Name']})) - metric_datum.merge!(Aws.indexed_param('Dimensions.member.%d.Value', dimensions.map {|dimension| dimension['Value']})) + metric_datum.merge!(AWS.indexed_param('Dimensions.member.%d.Name', dimensions.map {|dimension| dimension['Name']})) + metric_datum.merge!(AWS.indexed_param('Dimensions.member.%d.Value', dimensions.map {|dimension| dimension['Value']})) end metric_datum end #then flatten out an hashes in the metric_data array metric_data.map! { |metric_datum| flatten_hash(metric_datum) } #then index the metric_data array - options.merge!(Aws.indexed_param('MetricData.member.%d', [*metric_data])) + options.merge!(AWS.indexed_param('MetricData.member.%d', [*metric_data])) #then finally flatten out an hashes in the overall options array options = flatten_hash(options) diff --git a/lib/fog/aws/requests/compute/allocate_address.rb b/lib/fog/aws/requests/compute/allocate_address.rb index 2a3a9e025..e57a9af19 100644 --- a/lib/fog/aws/requests/compute/allocate_address.rb +++ b/lib/fog/aws/requests/compute/allocate_address.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/allocate_address' @@ -14,7 +14,7 @@ module Fog # * 'publicIp'<~String> - The acquired address # * 'requestId'<~String> - Id of the request # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-AllocateAddress.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AllocateAddress.html] def allocate_address(domain='standard') domain = domain == 'vpc' ? 'vpc' : 'standard' request( diff --git a/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb b/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb index a1bf2138a..a1dde0e13 100644 --- a/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb +++ b/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/assign_private_ip_addresses' @@ -17,7 +17,7 @@ module Fog # * 'requestId'<~String> - The ID of the request. # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-AssignPrivateIpAddresses.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AssignPrivateIpAddresses.html] def assign_private_ip_addresses(network_interface_id, options={}) if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount'] raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.") diff --git a/lib/fog/aws/requests/compute/associate_address.rb b/lib/fog/aws/requests/compute/associate_address.rb index a9d32179f..ad6b7e147 100644 --- a/lib/fog/aws/requests/compute/associate_address.rb +++ b/lib/fog/aws/requests/compute/associate_address.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/associate_address' @@ -21,7 +21,7 @@ module Fog # * 'return'<~Boolean> - success? # * 'associationId'<~String> - association Id for eip to node (vpc only) # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-AssociateAddress.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AssociateAddress.html] def associate_address(*args) if args.first.kind_of? Hash params = args.first diff --git a/lib/fog/aws/requests/compute/associate_dhcp_options.rb b/lib/fog/aws/requests/compute/associate_dhcp_options.rb index d80892e75..f49bbecbf 100644 --- a/lib/fog/aws/requests/compute/associate_dhcp_options.rb +++ b/lib/fog/aws/requests/compute/associate_dhcp_options.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' # @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-AssociateDhcpOptions.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AssociateDhcpOptions.html] def associate_dhcp_options(dhcp_options_id, vpc_id) request( 'Action' => 'AssociateDhcpOptions', diff --git a/lib/fog/aws/requests/compute/associate_route_table.rb b/lib/fog/aws/requests/compute/associate_route_table.rb index b1dd6b89c..704415db9 100755 --- a/lib/fog/aws/requests/compute/associate_route_table.rb +++ b/lib/fog/aws/requests/compute/associate_route_table.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/associate_route_table' # Associates a subnet with a route table. @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - The ID of the request # * 'associationId'<~String> - The route table association ID (needed to disassociate the route table) # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-AssociateRouteTable.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AssociateRouteTable.html] def associate_route_table(routeTableId, subnetId) request( 'Action' => 'AssociateRouteTable', diff --git a/lib/fog/aws/requests/compute/attach_internet_gateway.rb b/lib/fog/aws/requests/compute/attach_internet_gateway.rb index 9416937ed..c2d3f4ccd 100644 --- a/lib/fog/aws/requests/compute/attach_internet_gateway.rb +++ b/lib/fog/aws/requests/compute/attach_internet_gateway.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' # Attaches an Internet gateway to a VPC, enabling connectivity between the Internet and the VPC @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-AttachInternetGateway.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AttachInternetGateway.html] def attach_internet_gateway(internet_gateway_id, vpc_id) request( 'Action' => 'AttachInternetGateway', diff --git a/lib/fog/aws/requests/compute/attach_network_interface.rb b/lib/fog/aws/requests/compute/attach_network_interface.rb index 8b5887396..83c4fab5b 100644 --- a/lib/fog/aws/requests/compute/attach_network_interface.rb +++ b/lib/fog/aws/requests/compute/attach_network_interface.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/attach_network_interface' @@ -17,7 +17,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'attachmentId'<~String> - ID of the attachment # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2012-03-01/APIReference/index.html?ApiReference-query-AttachNetworkInterface.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/index.html?ApiReference-query-AttachNetworkInterface.html] def attach_network_interface(nic_id, instance_id, device_index) request( 'Action' => 'AttachNetworkInterface', diff --git a/lib/fog/aws/requests/compute/attach_volume.rb b/lib/fog/aws/requests/compute/attach_volume.rb index a3db7d9e5..58f2ad974 100644 --- a/lib/fog/aws/requests/compute/attach_volume.rb +++ b/lib/fog/aws/requests/compute/attach_volume.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/attach_volume' @@ -21,7 +21,7 @@ module Fog # * 'status'<~String> - Status of volume # * 'volumeId'<~String> - Reference to volume # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-AttachVolume.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AttachVolume.html] def attach_volume(instance_id, volume_id, device) request( 'Action' => 'AttachVolume', diff --git a/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb b/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb index 0c721d41e..48eeb3680 100644 --- a/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb +++ b/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -38,7 +38,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-AuthorizeSecurityGroupIngress.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AuthorizeSecurityGroupIngress.html] def authorize_security_group_ingress(group_name, options = {}) options = Fog::AWS.parse_security_group_options(group_name, options) diff --git a/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb b/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb index 8219fbd0a..01f1e09d0 100644 --- a/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb +++ b/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/cancel_spot_instance_requests' @@ -17,7 +17,7 @@ module Fog # * 'spotInstanceRequestId'<~String> - id of cancelled spot instance # * 'state'<~String> - state of cancelled spot instance # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CancelSpotInstanceRequests.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CancelSpotInstanceRequests.html] def cancel_spot_instance_requests(spot_instance_request_id) params = Fog::AWS.indexed_param('SpotInstanceRequestId', spot_instance_request_id) request({ diff --git a/lib/fog/aws/requests/compute/copy_image.rb b/lib/fog/aws/requests/compute/copy_image.rb index 8b4ee9d35..0bbf15ebc 100644 --- a/lib/fog/aws/requests/compute/copy_image.rb +++ b/lib/fog/aws/requests/compute/copy_image.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/copy_image' @@ -8,7 +8,7 @@ module Fog # # ==== Parameters # * source_image_id<~String> - The ID of the AMI to copy - # * source_region<~String> - The name of the Aws region that contains the AMI to be copied + # * source_region<~String> - The name of the AWS region that contains the AMI to be copied # * name<~String> - The name of the new AMI in the destination region # * description<~String> - The description to set on the new AMI in the destination region # * client_token<~String> - Unique, case-sensitive identifier you provide to ensure idempotency of the request @@ -19,7 +19,7 @@ module Fog # * 'requestId'<~String> - id of request # * 'imageId'<~String> - id of image # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/CommandLineReference/ApiReference-cmd-CopyImage.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/CommandLineReference/ApiReference-cmd-CopyImage.html] def copy_image(source_image_id, source_region, name = nil, description = nil, client_token = nil) request( 'Action' => 'CopyImage', @@ -37,7 +37,7 @@ module Fog # # Usage # - # Aws[:compute].copy_image("ami-1aad5273", 'us-east-1') + # Fog::AWS[:compute].copy_image("ami-1aad5273", 'us-east-1') # def copy_image(source_image_id, source_region, name = nil, description = nil, client_token = nil) diff --git a/lib/fog/aws/requests/compute/copy_snapshot.rb b/lib/fog/aws/requests/compute/copy_snapshot.rb index 22fda1de1..47f96f660 100644 --- a/lib/fog/aws/requests/compute/copy_snapshot.rb +++ b/lib/fog/aws/requests/compute/copy_snapshot.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/copy_snapshot' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - id of request # * 'snapshotId'<~String> - id of snapshot # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CopySnapshot.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CopySnapshot.html] def copy_snapshot(source_snapshot_id, source_region, description = nil) request( 'Action' => 'CopySnapshot', @@ -32,7 +32,7 @@ module Fog # # Usage # - # Aws[:compute].copy_snapshot("snap-1db0a957", 'us-east-1') + # Fog::AWS[:compute].copy_snapshot("snap-1db0a957", 'us-east-1') # def copy_snapshot(source_snapshot_id, source_region, description = nil) diff --git a/lib/fog/aws/requests/compute/create_dhcp_options.rb b/lib/fog/aws/requests/compute/create_dhcp_options.rb index 0c9bdac37..3816ec612 100644 --- a/lib/fog/aws/requests/compute/create_dhcp_options.rb +++ b/lib/fog/aws/requests/compute/create_dhcp_options.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_dhcp_options' @@ -14,7 +14,7 @@ module Fog # * body<~Hash>: # * 'requestId'<~String> - Id of request # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CreateDhcpOptions.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateDhcpOptions.html] def create_dhcp_options(dhcp_configurations = {}) params = {} params.merge!(indexed_multidimensional_params(dhcp_configurations)) diff --git a/lib/fog/aws/requests/compute/create_image.rb b/lib/fog/aws/requests/compute/create_image.rb index 5d328c56d..49a59dfb0 100644 --- a/lib/fog/aws/requests/compute/create_image.rb +++ b/lib/fog/aws/requests/compute/create_image.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_image' @@ -18,7 +18,7 @@ module Fog # * 'imageId'<~String> - The ID of the created AMI. # * 'requestId'<~String> - Id of request. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CreateImage.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateImage.html] def create_image(instance_id, name, description, no_reboot = false, options={}) params = {} block_device_mappings = options[:block_device_mappings] || [] @@ -47,7 +47,7 @@ module Fog class Mock # Usage # - # Aws[:compute].create_image("i-ac65ee8c", "test", "something") + # Fog::AWS[:compute].create_image("i-ac65ee8c", "test", "something") # def create_image(instance_id, name, description, no_reboot = false, options = {}) diff --git a/lib/fog/aws/requests/compute/create_internet_gateway.rb b/lib/fog/aws/requests/compute/create_internet_gateway.rb index fa18cac31..ba0aee217 100644 --- a/lib/fog/aws/requests/compute/create_internet_gateway.rb +++ b/lib/fog/aws/requests/compute/create_internet_gateway.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_internet_gateway' @@ -21,7 +21,7 @@ module Fog # * 'key'<~String> - Tag's key # * 'value'<~String> - Tag's value # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-ItemType-InternetGatewayAttachmentType.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-ItemType-InternetGatewayAttachmentType.html] def create_internet_gateway() request({ 'Action' => 'CreateInternetGateway', diff --git a/lib/fog/aws/requests/compute/create_key_pair.rb b/lib/fog/aws/requests/compute/create_key_pair.rb index 01723d254..688b1b4ed 100644 --- a/lib/fog/aws/requests/compute/create_key_pair.rb +++ b/lib/fog/aws/requests/compute/create_key_pair.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_key_pair' @@ -17,7 +17,7 @@ module Fog # * 'keyName'<~String> - Name of key # * 'requestId'<~String> - Id of request # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CreateKeyPair.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateKeyPair.html] def create_key_pair(key_name) request( 'Action' => 'CreateKeyPair', diff --git a/lib/fog/aws/requests/compute/create_network_acl.rb b/lib/fog/aws/requests/compute/create_network_acl.rb index b3d5e0ac0..45bf4adbe 100644 --- a/lib/fog/aws/requests/compute/create_network_acl.rb +++ b/lib/fog/aws/requests/compute/create_network_acl.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_network_acl' @@ -37,7 +37,7 @@ module Fog # * 'key'<~String> - Tag's key # * 'value'<~String> - Tag's value # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-CreateNetworkAcl.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateNetworkAcl.html] def create_network_acl(vpcId, options = {}) request({ 'Action' => 'CreateNetworkAcl', diff --git a/lib/fog/aws/requests/compute/create_network_acl_entry.rb b/lib/fog/aws/requests/compute/create_network_acl_entry.rb index 1b5d24b1b..e8b57b2d1 100644 --- a/lib/fog/aws/requests/compute/create_network_acl_entry.rb +++ b/lib/fog/aws/requests/compute/create_network_acl_entry.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -25,7 +25,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-CreateNetworkAclEntry.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateNetworkAclEntry.html] def create_network_acl_entry(network_acl_id, rule_number, protocol, rule_action, cidr_block, egress, options = {}) request({ 'Action' => 'CreateNetworkAclEntry', diff --git a/lib/fog/aws/requests/compute/create_network_interface.rb b/lib/fog/aws/requests/compute/create_network_interface.rb index 903abbbf9..3bb6e2c8d 100644 --- a/lib/fog/aws/requests/compute/create_network_interface.rb +++ b/lib/fog/aws/requests/compute/create_network_interface.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_network_interface' @@ -46,7 +46,7 @@ module Fog # * 'key'<~String> - Tag's key # * 'value'<~String> - Tag's value # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2012-03-01/APIReference/ApiReference-query-CreateNetworkInterface.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/ApiReference-query-CreateNetworkInterface.html] def create_network_interface(subnetId, options = {}) if security_groups = options.delete('GroupSet') options.merge!(Fog::AWS.indexed_param('SecurityGroupId', [*security_groups])) diff --git a/lib/fog/aws/requests/compute/create_placement_group.rb b/lib/fog/aws/requests/compute/create_placement_group.rb index ab5f0fd91..c16f22e67 100644 --- a/lib/fog/aws/requests/compute/create_placement_group.rb +++ b/lib/fog/aws/requests/compute/create_placement_group.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CreatePlacementGroup.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreatePlacementGroup.html] def create_placement_group(name, strategy) request( 'Action' => 'CreatePlacementGroup', diff --git a/lib/fog/aws/requests/compute/create_route.rb b/lib/fog/aws/requests/compute/create_route.rb index 3d26b0904..ceeda3d2e 100755 --- a/lib/fog/aws/requests/compute/create_route.rb +++ b/lib/fog/aws/requests/compute/create_route.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -19,7 +19,7 @@ module Fog # * 'requestId'<~String> - Id of the request # * 'return'<~Boolean> - Returns true if the request succeeds. Otherwise, returns an error. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-CreateRoute.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateRoute.html] def create_route(route_table_id, destination_cidr_block, internet_gateway_id=nil, instance_id=nil, network_interface_id=nil) request_vars = { 'Action' => 'CreateRoute', diff --git a/lib/fog/aws/requests/compute/create_route_table.rb b/lib/fog/aws/requests/compute/create_route_table.rb index e7b6403f6..e5a1bce8f 100755 --- a/lib/fog/aws/requests/compute/create_route_table.rb +++ b/lib/fog/aws/requests/compute/create_route_table.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_route_table' @@ -22,7 +22,7 @@ module Fog # * 'gatewayId'<~String> - The ID of an Internet gateway attached to your VPC. # * 'state'<~String> - The state of the route. ['blackhole', 'available'] # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-CreateRouteTable.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateRouteTable.html] def create_route_table(vpc_id) request({ 'Action' => 'CreateRouteTable', diff --git a/lib/fog/aws/requests/compute/create_security_group.rb b/lib/fog/aws/requests/compute/create_security_group.rb index ca011399a..58233f94b 100644 --- a/lib/fog/aws/requests/compute/create_security_group.rb +++ b/lib/fog/aws/requests/compute/create_security_group.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_security_group' @@ -18,7 +18,7 @@ module Fog # * 'return'<~Boolean> - success? # * 'groupId'<~String> - Id of created group # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CreateSecurityGroup.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSecurityGroup.html] def create_security_group(name, description, vpc_id=nil) request( 'Action' => 'CreateSecurityGroup', diff --git a/lib/fog/aws/requests/compute/create_snapshot.rb b/lib/fog/aws/requests/compute/create_snapshot.rb index 20aa79703..81aec313d 100644 --- a/lib/fog/aws/requests/compute/create_snapshot.rb +++ b/lib/fog/aws/requests/compute/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_snapshot' @@ -20,7 +20,7 @@ module Fog # * 'status'<~String> - state of snapshot # * 'volumeId'<~String> - id of volume snapshot targets # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CreateSnapshot.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSnapshot.html] def create_snapshot(volume_id, description = nil) request( 'Action' => 'CreateSnapshot', @@ -35,7 +35,7 @@ module Fog # # Usage # - # Aws[:compute].create_snapshot("vol-f7c23423", "latest snapshot") + # Fog::AWS[:compute].create_snapshot("vol-f7c23423", "latest snapshot") # def create_snapshot(volume_id, description = nil) diff --git a/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb index 8f616ff82..7ae94f9bd 100644 --- a/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb +++ b/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/spot_datafeed_subscription' @@ -19,11 +19,11 @@ module Fog # * 'fault'<~Hash>: # * 'code'<~String> - fault code # * 'reason'<~String> - fault reason - # * 'ownerId'<~String> - Aws id of account owner + # * 'ownerId'<~String> - AWS id of account owner # * 'prefix'<~String> - prefix for datafeed items # * 'state'<~String> - state of datafeed subscription # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CreateSpotDatafeedSubscription.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSpotDatafeedSubscription.html] def create_spot_datafeed_subscription(bucket, prefix) request( 'Action' => 'CreateSpotDatafeedSubscription', diff --git a/lib/fog/aws/requests/compute/create_subnet.rb b/lib/fog/aws/requests/compute/create_subnet.rb index e74b81c87..c061fcccf 100644 --- a/lib/fog/aws/requests/compute/create_subnet.rb +++ b/lib/fog/aws/requests/compute/create_subnet.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'ipaddress' require 'fog/aws/parsers/compute/create_subnet' @@ -11,7 +11,7 @@ module Fog # * vpcId<~String> - The ID of the VPC where you want to create the subnet. # * cidrBlock<~String> - The CIDR block you want the Subnet to cover (e.g., 10.0.0.0/16). # * options<~Hash>: - # * AvailabilityZone<~String> - The Availability Zone you want the subnet in. Default: Aws selects a zone for you (recommended) + # * AvailabilityZone<~String> - The Availability Zone you want the subnet in. Default: AWS selects a zone for you (recommended) # # === Returns # * response<~Excon::Response>: @@ -28,7 +28,7 @@ module Fog # * 'key'<~String> - Tag's key # * 'value'<~String> - Tag's value # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2011-07-15/APIReference/ApiReference-query-CreateSubnet.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2011-07-15/APIReference/ApiReference-query-CreateSubnet.html] def create_subnet(vpcId, cidrBlock, options = {}) request({ 'Action' => 'CreateSubnet', diff --git a/lib/fog/aws/requests/compute/create_tags.rb b/lib/fog/aws/requests/compute/create_tags.rb index 56875b35b..c2ea76240 100644 --- a/lib/fog/aws/requests/compute/create_tags.rb +++ b/lib/fog/aws/requests/compute/create_tags.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CreateTags.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateTags.html] def create_tags(resources, tags) resources = [*resources] for key, value in tags diff --git a/lib/fog/aws/requests/compute/create_volume.rb b/lib/fog/aws/requests/compute/create_volume.rb index c4b504f51..cda0a7036 100644 --- a/lib/fog/aws/requests/compute/create_volume.rb +++ b/lib/fog/aws/requests/compute/create_volume.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_volume' @@ -28,7 +28,7 @@ module Fog # * 'iops'<~Integer> - Number of IOPS the volume supports # * 'encrypted'<~Boolean> - Indicates whether the volume will be encrypted # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-CreateVolume.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateVolume.html] def create_volume(availability_zone, size, options = {}) unless options.is_a?(Hash) Fog::Logger.deprecation("create_volume with a bare snapshot_id is deprecated, use create_volume(availability_zone, size, 'SnapshotId' => snapshot_id) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/create_vpc.rb b/lib/fog/aws/requests/compute/create_vpc.rb index 333991713..0afd3c833 100644 --- a/lib/fog/aws/requests/compute/create_vpc.rb +++ b/lib/fog/aws/requests/compute/create_vpc.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/create_vpc' @@ -26,7 +26,7 @@ module Fog # * 'key'<~String> - Tag's key # * 'value'<~String> - Tag's value # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2011-07-15/APIReference/index.html?ApiReference-query-CreateVpc.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2011-07-15/APIReference/index.html?ApiReference-query-CreateVpc.html] def create_vpc(cidrBlock, options = {}) request({ 'Action' => 'CreateVpc', @@ -58,7 +58,7 @@ module Fog default_route = self.route_tables.new(:vpc_id => vpc_id) default_route.save - # You are not able to push a main route in the normal Aws, so we are re-implementing some of the + # You are not able to push a main route in the normal AWS, so we are re-implementing some of the # associate_route_table here in order to accomplish this. route_table = self.data[:route_tables].find { |routetable| routetable["routeTableId"].eql? default_route.id } diff --git a/lib/fog/aws/requests/compute/delete_dhcp_options.rb b/lib/fog/aws/requests/compute/delete_dhcp_options.rb index 23f3e19bd..d8f076bc6 100644 --- a/lib/fog/aws/requests/compute/delete_dhcp_options.rb +++ b/lib/fog/aws/requests/compute/delete_dhcp_options.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' #Deletes a set of DHCP options that you specify. Amazon VPC returns an error if the set of options you specify is currently @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteDhcpOptions.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteDhcpOptions.html] def delete_dhcp_options(dhcp_options_id) request( 'Action' => 'DeleteDhcpOptions', diff --git a/lib/fog/aws/requests/compute/delete_internet_gateway.rb b/lib/fog/aws/requests/compute/delete_internet_gateway.rb index 1b9841a9f..ce725dc88 100644 --- a/lib/fog/aws/requests/compute/delete_internet_gateway.rb +++ b/lib/fog/aws/requests/compute/delete_internet_gateway.rb @@ -1,9 +1,9 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' - #Deletes an Internet gateway from your Aws account. The gateway must not be attached to a VPC + #Deletes an Internet gateway from your AWS account. The gateway must not be attached to a VPC # # ==== Parameters # * internet_gateway_id<~String> - The ID of the InternetGateway you want to delete. @@ -14,7 +14,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteInternetGateway.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteInternetGateway.html] def delete_internet_gateway(internet_gateway_id) request( 'Action' => 'DeleteInternetGateway', diff --git a/lib/fog/aws/requests/compute/delete_key_pair.rb b/lib/fog/aws/requests/compute/delete_key_pair.rb index 3d94b409c..c39cf3b5c 100644 --- a/lib/fog/aws/requests/compute/delete_key_pair.rb +++ b/lib/fog/aws/requests/compute/delete_key_pair.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteKeyPair.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteKeyPair.html] def delete_key_pair(key_name) request( 'Action' => 'DeleteKeyPair', diff --git a/lib/fog/aws/requests/compute/delete_network_acl.rb b/lib/fog/aws/requests/compute/delete_network_acl.rb index eda1d7e25..674bcdac1 100644 --- a/lib/fog/aws/requests/compute/delete_network_acl.rb +++ b/lib/fog/aws/requests/compute/delete_network_acl.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteNetworkAcl.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteNetworkAcl.html] def delete_network_acl(network_acl_id) request( 'Action' => 'DeleteNetworkAcl', diff --git a/lib/fog/aws/requests/compute/delete_network_acl_entry.rb b/lib/fog/aws/requests/compute/delete_network_acl_entry.rb index 198dd6d7e..7108beab9 100644 --- a/lib/fog/aws/requests/compute/delete_network_acl_entry.rb +++ b/lib/fog/aws/requests/compute/delete_network_acl_entry.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -17,7 +17,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteNetworkAclEntry.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteNetworkAclEntry.html] def delete_network_acl_entry(network_acl_id, rule_number, egress) request( 'Action' => 'DeleteNetworkAclEntry', diff --git a/lib/fog/aws/requests/compute/delete_network_interface.rb b/lib/fog/aws/requests/compute/delete_network_interface.rb index 3963c899c..f80c37e81 100644 --- a/lib/fog/aws/requests/compute/delete_network_interface.rb +++ b/lib/fog/aws/requests/compute/delete_network_interface.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' # Deletes a network interface. @@ -14,7 +14,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2012-03-01/APIReference/ApiReference-query-DeleteNetworkInterface.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/ApiReference-query-DeleteNetworkInterface.html] def delete_network_interface(network_interface_id) request( 'Action' => 'DeleteNetworkInterface', diff --git a/lib/fog/aws/requests/compute/delete_placement_group.rb b/lib/fog/aws/requests/compute/delete_placement_group.rb index 9e93d2cf4..adc5e8457 100644 --- a/lib/fog/aws/requests/compute/delete_placement_group.rb +++ b/lib/fog/aws/requests/compute/delete_placement_group.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DeletePlacementGroup.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeletePlacementGroup.html] def delete_placement_group(name) request( 'Action' => 'DeletePlacementGroup', diff --git a/lib/fog/aws/requests/compute/delete_route.rb b/lib/fog/aws/requests/compute/delete_route.rb index 2f3fe3e30..babe77ab8 100755 --- a/lib/fog/aws/requests/compute/delete_route.rb +++ b/lib/fog/aws/requests/compute/delete_route.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - The ID of the request. # * 'return'<~Boolean> - Returns true if the request succeeds. Otherwise, returns an error. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteRoute.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteRoute.html] def delete_route(route_table_id, destination_cidr_block) request( 'Action' => 'DeleteRoute', diff --git a/lib/fog/aws/requests/compute/delete_route_table.rb b/lib/fog/aws/requests/compute/delete_route_table.rb index 2d354375d..5ddb13dc1 100755 --- a/lib/fog/aws/requests/compute/delete_route_table.rb +++ b/lib/fog/aws/requests/compute/delete_route_table.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - The ID of request. # * 'return'<~Boolean> - Returns true if the request succeeds. Otherwise, returns an error. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteRouteTable.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteRouteTable.html] def delete_route_table(route_table_id) request( 'Action' => 'DeleteRouteTable', diff --git a/lib/fog/aws/requests/compute/delete_security_group.rb b/lib/fog/aws/requests/compute/delete_security_group.rb index e93b8ba5b..7117bcf86 100644 --- a/lib/fog/aws/requests/compute/delete_security_group.rb +++ b/lib/fog/aws/requests/compute/delete_security_group.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteSecurityGroup.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSecurityGroup.html] def delete_security_group(name, id = nil) if name && id raise Fog::Compute::AWS::Error.new("May not specify both group_name and group_id") diff --git a/lib/fog/aws/requests/compute/delete_snapshot.rb b/lib/fog/aws/requests/compute/delete_snapshot.rb index 868cb4f82..c64bdfc0b 100644 --- a/lib/fog/aws/requests/compute/delete_snapshot.rb +++ b/lib/fog/aws/requests/compute/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteSnapshot.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSnapshot.html] def delete_snapshot(snapshot_id) request( 'Action' => 'DeleteSnapshot', diff --git a/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb index 8db549b34..0a9e94c23 100644 --- a/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb +++ b/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -12,7 +12,7 @@ module Fog # * 'requestId'<~String> id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteSpotDatafeedSubscription.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSpotDatafeedSubscription.html] def delete_spot_datafeed_subscription request( 'Action' => 'DeleteSpotDatafeedSubscription', diff --git a/lib/fog/aws/requests/compute/delete_subnet.rb b/lib/fog/aws/requests/compute/delete_subnet.rb index 74d0aab3f..34874cd14 100644 --- a/lib/fog/aws/requests/compute/delete_subnet.rb +++ b/lib/fog/aws/requests/compute/delete_subnet.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' # Deletes a subnet from a VPC. You must terminate all running instances in the subnet before deleting it, otherwise Amazon @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2011-07-15/APIReference/ApiReference-query-DeleteSubnet.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2011-07-15/APIReference/ApiReference-query-DeleteSubnet.html] def delete_subnet(subnet_id) request( 'Action' => 'DeleteSubnet', diff --git a/lib/fog/aws/requests/compute/delete_tags.rb b/lib/fog/aws/requests/compute/delete_tags.rb index 3ad786a22..77111a200 100644 --- a/lib/fog/aws/requests/compute/delete_tags.rb +++ b/lib/fog/aws/requests/compute/delete_tags.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteTags.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteTags.html] def delete_tags(resources, tags) resources = [*resources] params = {} diff --git a/lib/fog/aws/requests/compute/delete_volume.rb b/lib/fog/aws/requests/compute/delete_volume.rb index 9627b4c4a..e3dd3ebc9 100644 --- a/lib/fog/aws/requests/compute/delete_volume.rb +++ b/lib/fog/aws/requests/compute/delete_volume.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DeleteVolume.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteVolume.html] def delete_volume(volume_id) request( 'Action' => 'DeleteVolume', diff --git a/lib/fog/aws/requests/compute/delete_vpc.rb b/lib/fog/aws/requests/compute/delete_vpc.rb index 4573b04fb..a2c99b598 100644 --- a/lib/fog/aws/requests/compute/delete_vpc.rb +++ b/lib/fog/aws/requests/compute/delete_vpc.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -18,7 +18,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2011-07-15/APIReference/index.html?ApiReference-query-DeleteVpc.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2011-07-15/APIReference/index.html?ApiReference-query-DeleteVpc.html] def delete_vpc(vpc_id) request( 'Action' => 'DeleteVpc', diff --git a/lib/fog/aws/requests/compute/deregister_image.rb b/lib/fog/aws/requests/compute/deregister_image.rb index 8379cad7a..c21b892b4 100644 --- a/lib/fog/aws/requests/compute/deregister_image.rb +++ b/lib/fog/aws/requests/compute/deregister_image.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/deregister_image' @@ -15,7 +15,7 @@ module Fog # * 'return'<~Boolean> - Returns true if deregistration succeeded # * 'requestId'<~String> - Id of request # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DeregisterImage.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeregisterImage.html] def deregister_image(image_id) request( 'Action' => 'DeregisterImage', diff --git a/lib/fog/aws/requests/compute/describe_account_attributes.rb b/lib/fog/aws/requests/compute/describe_account_attributes.rb index 3a6d5cd38..222509ae7 100644 --- a/lib/fog/aws/requests/compute/describe_account_attributes.rb +++ b/lib/fog/aws/requests/compute/describe_account_attributes.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_account_attributes' @@ -18,7 +18,7 @@ module Fog # * 'attributeValueSet'<~Array>: # * 'attributeValue'<~String> - Value of attribute # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeAccountAttributes.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAccountAttributes.html] def describe_account_attributes(filters = {}) params = Fog::AWS.indexed_filters(filters) diff --git a/lib/fog/aws/requests/compute/describe_addresses.rb b/lib/fog/aws/requests/compute/describe_addresses.rb index 625a516f7..fd5264289 100644 --- a/lib/fog/aws/requests/compute/describe_addresses.rb +++ b/lib/fog/aws/requests/compute/describe_addresses.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_addresses' @@ -17,7 +17,7 @@ module Fog # * 'instanceId'<~String> - instance for ip address # * 'publicIp'<~String> - ip address for instance # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeAddresses.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAddresses.html] def describe_addresses(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_availability_zones.rb b/lib/fog/aws/requests/compute/describe_availability_zones.rb index 33ea1c3e0..de27eec81 100644 --- a/lib/fog/aws/requests/compute/describe_availability_zones.rb +++ b/lib/fog/aws/requests/compute/describe_availability_zones.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_availability_zones' @@ -18,7 +18,7 @@ module Fog # * 'zoneName'<~String> - Name of zone # * 'zoneState'<~String> - State of zone # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeAvailabilityZones.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAvailabilityZones.html] def describe_availability_zones(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_dhcp_options.rb b/lib/fog/aws/requests/compute/describe_dhcp_options.rb index 38e55a749..9ae9b10ea 100644 --- a/lib/fog/aws/requests/compute/describe_dhcp_options.rb +++ b/lib/fog/aws/requests/compute/describe_dhcp_options.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_dhcp_options' @@ -23,7 +23,7 @@ module Fog # * 'key'<~String> - Tag's key # * 'value'<~String> - Tag's value # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-ItemType-DhcpOptionsType.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-ItemType-DhcpOptionsType.html] def describe_dhcp_options(filters = {}) unless filters.is_a?(Hash) Fog::Logger.warning("describe_dhcp_options with #{filters.class} param is deprecated, use dhcp_options('dhcp-options-id' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_images.rb b/lib/fog/aws/requests/compute/describe_images.rb index 4e3081d53..2f786c660 100644 --- a/lib/fog/aws/requests/compute/describe_images.rb +++ b/lib/fog/aws/requests/compute/describe_images.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_images' @@ -37,7 +37,7 @@ module Fog # * 'rootDeviceType'<~String> - Root device type, ebs or instance-store # * 'virtualizationType'<~String> - Type of virtualization # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeImages.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeImages.html] def describe_images(filters = {}) options = {} for key in ['ExecutableBy', 'ImageId', 'Owner'] diff --git a/lib/fog/aws/requests/compute/describe_instance_status.rb b/lib/fog/aws/requests/compute/describe_instance_status.rb index 2946ac909..ba07c5688 100644 --- a/lib/fog/aws/requests/compute/describe_instance_status.rb +++ b/lib/fog/aws/requests/compute/describe_instance_status.rb @@ -1,10 +1,10 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_instance_status' - # http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeInstanceStatus.html + # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstanceStatus.html # def describe_instance_status(filters = {}) raise ArgumentError.new("Filters must be a hash, but is a #{filters.class}.") unless filters.is_a?(Hash) diff --git a/lib/fog/aws/requests/compute/describe_instances.rb b/lib/fog/aws/requests/compute/describe_instances.rb index 50b2d796b..82a8611e0 100644 --- a/lib/fog/aws/requests/compute/describe_instances.rb +++ b/lib/fog/aws/requests/compute/describe_instances.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_instances' @@ -18,7 +18,7 @@ module Fog # * 'nextToken' - The token to use when requesting the next set of items when fetching items in batches. # * 'reservationSet'<~Array>: # * 'groupSet'<~Array> - Group names for reservation - # * 'ownerId'<~String> - Aws Access Key ID of reservation owner + # * 'ownerId'<~String> - AWS Access Key ID of reservation owner # * 'reservationId'<~String> - Id of the reservation # * 'instancesSet'<~Array>: # * instance<~Hash>: @@ -55,7 +55,7 @@ module Fog # * 'ramdiskId'<~String> - Id of ramdisk used to launch instance # * 'reason'<~String> - reason for most recent state transition, or blank # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeInstances.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html] def describe_instances(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_internet_gateways.rb b/lib/fog/aws/requests/compute/describe_internet_gateways.rb index fb18e0a3b..d01fa3e53 100644 --- a/lib/fog/aws/requests/compute/describe_internet_gateways.rb +++ b/lib/fog/aws/requests/compute/describe_internet_gateways.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_internet_gateways' @@ -22,7 +22,7 @@ module Fog # * 'key'<~String> - Tag's key # * 'value'<~String> - Tag's value # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-ItemType-InternetGatewayType.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-ItemType-InternetGatewayType.html] def describe_internet_gateways(filters = {}) unless filters.is_a?(Hash) Fog::Logger.warning("describe_internet_gateways with #{filters.class} param is deprecated, use internet_gateways('internet-gateway-id' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_key_pairs.rb b/lib/fog/aws/requests/compute/describe_key_pairs.rb index a0e75de0d..cd98d2d9a 100644 --- a/lib/fog/aws/requests/compute/describe_key_pairs.rb +++ b/lib/fog/aws/requests/compute/describe_key_pairs.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_key_pairs' @@ -17,7 +17,7 @@ module Fog # * 'keyName'<~String> - Name of key # * 'keyFingerprint'<~String> - Fingerprint of key # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeKeyPairs.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeKeyPairs.html] def describe_key_pairs(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_network_acls.rb b/lib/fog/aws/requests/compute/describe_network_acls.rb index a30a1d953..98b6e00ce 100644 --- a/lib/fog/aws/requests/compute/describe_network_acls.rb +++ b/lib/fog/aws/requests/compute/describe_network_acls.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_network_acls' @@ -37,7 +37,7 @@ module Fog # * 'key'<~String> - Tag's key # * 'value'<~String> - Tag's value # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeNetworkAcls.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeNetworkAcls.html] def describe_network_acls(filters = {}) params = Fog::AWS.indexed_filters(filters) request({ diff --git a/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb b/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb index d23f6ecde..708b7400c 100644 --- a/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb +++ b/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_network_interface_attribute' # Describes a network interface attribute value @@ -28,7 +28,7 @@ module Fog # * 'attachTime'<~String> # * 'deleteOnTermination<~Boolean> # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2012-03-01/APIReference/ApiReference-query-DescribeNetworkInterfaceAttribute.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/ApiReference-query-DescribeNetworkInterfaceAttribute.html] def describe_network_interface_attribute(network_interface_id, attribute) request( 'Action' => 'DescribeNetworkInterfaceAttribute', diff --git a/lib/fog/aws/requests/compute/describe_network_interfaces.rb b/lib/fog/aws/requests/compute/describe_network_interfaces.rb index 4bd25ce4e..96a2644fe 100644 --- a/lib/fog/aws/requests/compute/describe_network_interfaces.rb +++ b/lib/fog/aws/requests/compute/describe_network_interfaces.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_network_interfaces' @@ -51,7 +51,7 @@ module Fog # * 'privateDnsName'<~String> - The private DNS associate to the ip address # * 'primay'<~String> - Whether main ip associate with NIC true of false # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2012-03-01/APIReference/index.html?ApiReference-query-DescribeNetworkInterfaces.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/index.html?ApiReference-query-DescribeNetworkInterfaces.html] def describe_network_interfaces(filters = {}) params = Fog::AWS.indexed_filters(filters) request({ diff --git a/lib/fog/aws/requests/compute/describe_placement_groups.rb b/lib/fog/aws/requests/compute/describe_placement_groups.rb index 19c53b67b..a3f65418b 100644 --- a/lib/fog/aws/requests/compute/describe_placement_groups.rb +++ b/lib/fog/aws/requests/compute/describe_placement_groups.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_placement_groups' @@ -18,7 +18,7 @@ module Fog # * 'strategy'<~String> - Strategy of placement group # * 'state'<~String> - State of placement group # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribePlacementGroups.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribePlacementGroups.html] def describe_placement_groups(filters = {}) params = Fog::AWS.indexed_filters(filters) request({ diff --git a/lib/fog/aws/requests/compute/describe_regions.rb b/lib/fog/aws/requests/compute/describe_regions.rb index 79de5d572..c0b34b552 100644 --- a/lib/fog/aws/requests/compute/describe_regions.rb +++ b/lib/fog/aws/requests/compute/describe_regions.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_regions' @@ -17,7 +17,7 @@ module Fog # * 'regionName'<~String> - Name of region # * 'regionEndpoint'<~String> - Service endpoint for region # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeRegions.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html] def describe_regions(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_reserved_instances.rb b/lib/fog/aws/requests/compute/describe_reserved_instances.rb index 1f08de481..1c31fbd73 100644 --- a/lib/fog/aws/requests/compute/describe_reserved_instances.rb +++ b/lib/fog/aws/requests/compute/describe_reserved_instances.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_reserved_instances' @@ -26,7 +26,7 @@ module Fog # * 'usagePrice"<~Float> - usage price of reserved instances, per hour # * 'end' - time reservation stopped being applied (i.e sold or canceled - as of version 2013/10/01) # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeReservedInstances.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstances.html] def describe_reserved_instances(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_reserved_instances with #{filters.class} param is deprecated, use describe_reserved_instances('reserved-instances-id' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb b/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb index 883e1de27..72b0b65fb 100644 --- a/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb +++ b/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_reserved_instances_offerings' @@ -32,7 +32,7 @@ module Fog # * 'reservedInstancesOfferingId'<~String> - id of offering # * 'usagePrice'<~Float> - usage price of offering, per hour # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeReservedInstancesOfferings.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstancesOfferings.html] def describe_reserved_instances_offerings(filters = {}) options = {} for key in ['AvailabilityZone', 'InstanceType', 'InstanceTenancy', 'OfferingType', 'ProductDescription', 'MaxDuration', 'MinDuration'] diff --git a/lib/fog/aws/requests/compute/describe_route_tables.rb b/lib/fog/aws/requests/compute/describe_route_tables.rb index 3bd393d82..19ce54d77 100755 --- a/lib/fog/aws/requests/compute/describe_route_tables.rb +++ b/lib/fog/aws/requests/compute/describe_route_tables.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_route_tables' @@ -36,7 +36,7 @@ module Fog # * 'key'<~String> - The tag key. # * 'value'<~String> - The tag value. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeRouteTables.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRouteTables.html] def describe_route_tables(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_route_tables with #{filters.class} param is deprecated, use describe_route_tables('route-table-id' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_security_groups.rb b/lib/fog/aws/requests/compute/describe_security_groups.rb index 972b0c015..6d4beb6fa 100644 --- a/lib/fog/aws/requests/compute/describe_security_groups.rb +++ b/lib/fog/aws/requests/compute/describe_security_groups.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_security_groups' @@ -21,14 +21,14 @@ module Fog # * 'fromPort'<~Integer> - Start of port range (or -1 for ICMP wildcard) # * 'groups'<~Array>: # * 'groupName'<~String> - Name of security group - # * 'userId'<~String> - Aws User Id of account + # * 'userId'<~String> - AWS User Id of account # * 'ipProtocol'<~String> - Ip protocol, must be in ['tcp', 'udp', 'icmp'] # * 'ipRanges'<~Array>: # * 'cidrIp'<~String> - CIDR range # * 'toPort'<~Integer> - End of port range (or -1 for ICMP wildcard) - # * 'ownerId'<~String> - Aws Access Key Id of the owner of the security group + # * 'ownerId'<~String> - AWS Access Key Id of the owner of the security group # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeSecurityGroups.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSecurityGroups.html] def describe_security_groups(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_snapshots.rb b/lib/fog/aws/requests/compute/describe_snapshots.rb index ecfdeefc1..dca6cda86 100644 --- a/lib/fog/aws/requests/compute/describe_snapshots.rb +++ b/lib/fog/aws/requests/compute/describe_snapshots.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_snapshots' @@ -24,7 +24,7 @@ module Fog # * 'status'<~String>: Snapshot state, in ['pending', 'completed'] # * 'volumeId'<~String>: Id of volume that snapshot contains # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeSnapshots.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSnapshots.html] def describe_snapshots(filters = {}, options = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb index 0369b90e9..25e0ca9e1 100644 --- a/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb +++ b/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/spot_datafeed_subscription' @@ -15,11 +15,11 @@ module Fog # * 'fault'<~Hash>: # * 'code'<~String> - fault code # * 'reason'<~String> - fault reason - # * 'ownerId'<~String> - Aws id of account owner + # * 'ownerId'<~String> - AWS id of account owner # * 'prefix'<~String> - prefix for datafeed items # * 'state'<~String> - state of datafeed subscription # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeSpotDatafeedSubscription.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSpotDatafeedSubscription.html] def describe_spot_datafeed_subscription request({ 'Action' => 'DescribeSpotDatafeedSubscription', diff --git a/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb b/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb index 2ba43b542..a65b5147d 100644 --- a/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb +++ b/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/spot_instance_requests' @@ -31,7 +31,7 @@ module Fog # * 'state'<~String> - spot instance request state # * 'type'<~String> - spot instance request type # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeSpotInstanceRequests.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSpotInstanceRequests.html] def describe_spot_instance_requests(filters = {}) params = Fog::AWS.indexed_filters(filters) request({ diff --git a/lib/fog/aws/requests/compute/describe_spot_price_history.rb b/lib/fog/aws/requests/compute/describe_spot_price_history.rb index 0d9665853..ddff34f08 100644 --- a/lib/fog/aws/requests/compute/describe_spot_price_history.rb +++ b/lib/fog/aws/requests/compute/describe_spot_price_history.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_spot_price_history' @@ -20,7 +20,7 @@ module Fog # * 'spotPrice'<~Float> - maximum price to launch one or more instances # * 'timestamp'<~Time> - date and time of request creation # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeSpotPriceHistory.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSpotPriceHistory.html] def describe_spot_price_history(filters = {}) params = Fog::AWS.indexed_filters(filters) request({ diff --git a/lib/fog/aws/requests/compute/describe_subnets.rb b/lib/fog/aws/requests/compute/describe_subnets.rb index 2fa62fb37..f48967f9e 100644 --- a/lib/fog/aws/requests/compute/describe_subnets.rb +++ b/lib/fog/aws/requests/compute/describe_subnets.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_subnets' @@ -26,7 +26,7 @@ module Fog # * 'value'<~String> - Tag's value # * 'instanceTenancy'<~String> - The allowed tenancy of instances launched into the Subnet. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2011-07-15/APIReference/index.html?ApiReference-query-DescribeSubnets.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2011-07-15/APIReference/index.html?ApiReference-query-DescribeSubnets.html] def describe_subnets(filters = {}) unless filters.is_a?(Hash) Fog::Logger.warning("describe_subnets with #{filters.class} param is deprecated, use describe_subnets('subnet-id' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_tags.rb b/lib/fog/aws/requests/compute/describe_tags.rb index 648dd1db5..273db7c16 100644 --- a/lib/fog/aws/requests/compute/describe_tags.rb +++ b/lib/fog/aws/requests/compute/describe_tags.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_tags' @@ -19,7 +19,7 @@ module Fog # * 'key'<~String> - Tag's key # * 'value'<~String> - Tag's value # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeTags.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeTags.html] def describe_tags(filters = {}) params = Fog::AWS.indexed_filters(filters) request({ diff --git a/lib/fog/aws/requests/compute/describe_volume_status.rb b/lib/fog/aws/requests/compute/describe_volume_status.rb index 104f6507d..7a8d57d20 100644 --- a/lib/fog/aws/requests/compute/describe_volume_status.rb +++ b/lib/fog/aws/requests/compute/describe_volume_status.rb @@ -1,10 +1,10 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_volume_status' - # http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeVolumeStatus.html + # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVolumeStatus.html def describe_volume_status(filters = {}) raise ArgumentError.new("Filters must be a hash, but is a #{filters.class}.") unless filters.is_a?(Hash) next_token = filters.delete('nextToken') || filters.delete('NextToken') diff --git a/lib/fog/aws/requests/compute/describe_volumes.rb b/lib/fog/aws/requests/compute/describe_volumes.rb index f27bd3abc..ae7b4ef43 100644 --- a/lib/fog/aws/requests/compute/describe_volumes.rb +++ b/lib/fog/aws/requests/compute/describe_volumes.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_volumes' @@ -30,7 +30,7 @@ module Fog # * 'status'<~String> - Attachment state # * 'volumeId'<~String> - Reference to volume # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DescribeVolumes.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVolumes.html] def describe_volumes(filters = {}) unless filters.is_a?(Hash) Fog::Logger.deprecation("describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/describe_vpc_attribute.rb b/lib/fog/aws/requests/compute/describe_vpc_attribute.rb index 45f42e8f4..011f2482e 100644 --- a/lib/fog/aws/requests/compute/describe_vpc_attribute.rb +++ b/lib/fog/aws/requests/compute/describe_vpc_attribute.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_vpc_attribute' # Describes a vpc attribute value @@ -17,7 +17,7 @@ module Fog # * 'enableDnsSupport'<~Boolean> - Flag indicating whether DNS resolution is enabled for the VPC (if requested) # * 'enableDnsHostnames'<~Boolean> - Flag indicating whether the instances launched in the VPC get DNS hostnames (if requested) # - # (Amazon API Reference)[http://docs.amazonwebservices.com/AwsEC2/2014-02-01/APIReference/ApiReference-query-DescribeVpcAttribute.html] + # (Amazon API Reference)[http://docs.amazonwebservices.com/AWSEC2/2014-02-01/APIReference/ApiReference-query-DescribeVpcAttribute.html] def describe_vpc_attribute(vpc_id, attribute) request( 'Action' => 'DescribeVpcAttribute', diff --git a/lib/fog/aws/requests/compute/describe_vpcs.rb b/lib/fog/aws/requests/compute/describe_vpcs.rb index dfce9d32c..ef85a5416 100644 --- a/lib/fog/aws/requests/compute/describe_vpcs.rb +++ b/lib/fog/aws/requests/compute/describe_vpcs.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/describe_vpcs' @@ -23,7 +23,7 @@ module Fog # * 'value'<~String> - Tag's value # * 'instanceTenancy'<~String> - The allowed tenancy of instances launched into the VPC. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2011-07-15/APIReference/index.html?ApiReference-query-DescribeVpcs.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2011-07-15/APIReference/index.html?ApiReference-query-DescribeVpcs.html] def describe_vpcs(filters = {}) unless filters.is_a?(Hash) Fog::Logger.warning("describe_vpcs with #{filters.class} param is deprecated, use describe_vpcs('vpc-id' => []) instead [light_black](#{caller.first})[/]") diff --git a/lib/fog/aws/requests/compute/detach_internet_gateway.rb b/lib/fog/aws/requests/compute/detach_internet_gateway.rb index 985705f40..9ad8401b9 100644 --- a/lib/fog/aws/requests/compute/detach_internet_gateway.rb +++ b/lib/fog/aws/requests/compute/detach_internet_gateway.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' # Detaches an Internet gateway to a VPC, enabling connectivity between the Internet and the VPC @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DetachInternetGateway.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DetachInternetGateway.html] def detach_internet_gateway(internet_gateway_id, vpc_id) request( 'Action' => 'DetachInternetGateway', diff --git a/lib/fog/aws/requests/compute/detach_network_interface.rb b/lib/fog/aws/requests/compute/detach_network_interface.rb index d56c3faa4..05d8e77fa 100644 --- a/lib/fog/aws/requests/compute/detach_network_interface.rb +++ b/lib/fog/aws/requests/compute/detach_network_interface.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' # Detaches a network interface. @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2012-03-01/APIReference/ApiReference-query-DetachNetworkInterface.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/ApiReference-query-DetachNetworkInterface.html] def detach_network_interface(attachment_id, force = false) request( 'Action' => 'DetachNetworkInterface', diff --git a/lib/fog/aws/requests/compute/detach_volume.rb b/lib/fog/aws/requests/compute/detach_volume.rb index dd7827db2..6a2617804 100644 --- a/lib/fog/aws/requests/compute/detach_volume.rb +++ b/lib/fog/aws/requests/compute/detach_volume.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/detach_volume' @@ -23,7 +23,7 @@ module Fog # * 'status'<~String> - Status of volume # * 'volumeId'<~String> - Reference to volume # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DetachVolume.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DetachVolume.html] def detach_volume(volume_id, options = {}) request({ 'Action' => 'DetachVolume', diff --git a/lib/fog/aws/requests/compute/disassociate_address.rb b/lib/fog/aws/requests/compute/disassociate_address.rb index 2128c3345..efbda12a4 100644 --- a/lib/fog/aws/requests/compute/disassociate_address.rb +++ b/lib/fog/aws/requests/compute/disassociate_address.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-DisassociateAddress.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DisassociateAddress.html] def disassociate_address(public_ip=nil, association_id=nil) request( 'Action' => 'DisassociateAddress', diff --git a/lib/fog/aws/requests/compute/disassociate_route_table.rb b/lib/fog/aws/requests/compute/disassociate_route_table.rb index 1da4c9e0f..47f67c468 100755 --- a/lib/fog/aws/requests/compute/disassociate_route_table.rb +++ b/lib/fog/aws/requests/compute/disassociate_route_table.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - The ID of the request. # * 'return'<~Boolean> - Returns true if the request succeeds. Otherwise, returns an error. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-DisassociateRouteTable.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DisassociateRouteTable.html] def disassociate_route_table(association_id) request( 'Action' => 'DisassociateRouteTable', diff --git a/lib/fog/aws/requests/compute/get_console_output.rb b/lib/fog/aws/requests/compute/get_console_output.rb index 7ca482acf..0c6396073 100644 --- a/lib/fog/aws/requests/compute/get_console_output.rb +++ b/lib/fog/aws/requests/compute/get_console_output.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/get_console_output' @@ -17,7 +17,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'timestamp'<~Time> - Timestamp of last update to output # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-GetConsoleOutput.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-GetConsoleOutput.html] def get_console_output(instance_id) request( 'Action' => 'GetConsoleOutput', diff --git a/lib/fog/aws/requests/compute/get_password_data.rb b/lib/fog/aws/requests/compute/get_password_data.rb index df7d0e5cc..8db8a777c 100644 --- a/lib/fog/aws/requests/compute/get_password_data.rb +++ b/lib/fog/aws/requests/compute/get_password_data.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/get_password_data' @@ -17,9 +17,9 @@ module Fog # * 'requestId'<~String> - Id of request # * 'timestamp'<~Time> - Timestamp of last update to output # - # See http://docs.amazonwebservices.com/AwsEC2/2010-08-31/APIReference/index.html?ApiReference-query-GetPasswordData.html + # See http://docs.amazonwebservices.com/AWSEC2/2010-08-31/APIReference/index.html?ApiReference-query-GetPasswordData.html # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-GetPasswordData.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-GetPasswordData.html] def get_password_data(instance_id) request( 'Action' => 'GetPasswordData', diff --git a/lib/fog/aws/requests/compute/import_key_pair.rb b/lib/fog/aws/requests/compute/import_key_pair.rb index fb2ba3d97..ac8dbe1e5 100644 --- a/lib/fog/aws/requests/compute/import_key_pair.rb +++ b/lib/fog/aws/requests/compute/import_key_pair.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/import_key_pair' @@ -17,7 +17,7 @@ module Fog # * 'keyName'<~String> - Name of key # * 'requestId'<~String> - Id of request # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-ImportKeyPair.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ImportKeyPair.html] def import_key_pair(key_name, public_key_material) request( 'Action' => 'ImportKeyPair', diff --git a/lib/fog/aws/requests/compute/modify_image_attribute.rb b/lib/fog/aws/requests/compute/modify_image_attribute.rb index 9ce9d3629..1eca49b55 100644 --- a/lib/fog/aws/requests/compute/modify_image_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_image_attribute.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -16,7 +16,7 @@ module Fog # * 'Remove.Group'<~Array> - One or more groups to revoke launch permission from # * 'Remove.UserId'<~Array> - One or more account ids to revoke launch permission from # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-ModifyImageAttribute.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyImageAttribute.html] # def modify_image_attribute(image_id, attributes) raise ArgumentError.new("image_id is required") unless image_id diff --git a/lib/fog/aws/requests/compute/modify_instance_attribute.rb b/lib/fog/aws/requests/compute/modify_instance_attribute.rb index 389769fd0..de18e0b94 100644 --- a/lib/fog/aws/requests/compute/modify_instance_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_instance_attribute.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -18,7 +18,7 @@ module Fog # 'SourceDestCheck.Value'<~Boolean> - New sourcedestcheck value # 'GroupId'<~Array> - One or more groups to add instance to (VPC only) # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-ModifyInstanceAttribute.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyInstanceAttribute.html] # def modify_instance_attribute(instance_id, attributes) params = {} diff --git a/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb b/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb index 0cc6a4f4a..4850ad715 100644 --- a/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -17,7 +17,7 @@ module Fog # attachmentid - the attachment to change # deleteOnTermination - a boolean # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2012-03-01/APIReference/ApiReference-query-ModifyNetworkInterfaceAttribute.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/ApiReference-query-ModifyNetworkInterfaceAttribute.html] def modify_network_interface_attribute(network_interface_id, attribute, value) params = {} case attribute diff --git a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb index 11b5a4251..da6923c6d 100644 --- a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -14,7 +14,7 @@ module Fog # * 'Remove.Group'<~Array> - One or more groups to revoke volume create permission from # * 'Remove.UserId'<~Array> - One or more account ids to revoke volume create permission from # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-ModifySnapshotAttribute.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifySnapshotAttribute.html] # def modify_snapshot_attribute(snapshot_id, attributes) params = {} diff --git a/lib/fog/aws/requests/compute/modify_subnet_attribute.rb b/lib/fog/aws/requests/compute/modify_subnet_attribute.rb index dd75d61ee..9499f73fa 100644 --- a/lib/fog/aws/requests/compute/modify_subnet_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_subnet_attribute.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/modify_subnet_attribute' @@ -19,7 +19,7 @@ module Fog # * body<~Hash>: # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. Otherwise, returns an error. - # http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-ModifySubnetAttribute.html + # http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ModifySubnetAttribute.html def modify_subnet_attribute(subnet_id, options = {}) params = {} params['MapPublicIpOnLaunch.Value'] = options.delete 'MapPublicIpOnLaunch' if options['MapPublicIpOnLaunch'] diff --git a/lib/fog/aws/requests/compute/modify_volume_attribute.rb b/lib/fog/aws/requests/compute/modify_volume_attribute.rb index 27a358e43..95047c071 100644 --- a/lib/fog/aws/requests/compute/modify_volume_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_volume_attribute.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-ModifyVolumeAttribute.html] + # {Amazon API Reference}[http://http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyVolumeAttribute.html] def modify_volume_attribute(volume_id=nil, auto_enable_io_value=false) request( 'Action' => 'ModifyVolumeAttribute', diff --git a/lib/fog/aws/requests/compute/modify_vpc_attribute.rb b/lib/fog/aws/requests/compute/modify_vpc_attribute.rb index a5bdd42ab..85626210a 100644 --- a/lib/fog/aws/requests/compute/modify_vpc_attribute.rb +++ b/lib/fog/aws/requests/compute/modify_vpc_attribute.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -21,7 +21,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-ModifyVpcAttribute.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyVpcAttribute.html] def modify_vpc_attribute(vpc_id, options = {}) request({ 'Action' => 'ModifyVpcAttribute', diff --git a/lib/fog/aws/requests/compute/monitor_instances.rb b/lib/fog/aws/requests/compute/monitor_instances.rb index 07a0785e6..8ff778144 100644 --- a/lib/fog/aws/requests/compute/monitor_instances.rb +++ b/lib/fog/aws/requests/compute/monitor_instances.rb @@ -1,11 +1,11 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/monitor_unmonitor_instances' # Monitor specified instance - # http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-MonitorInstances.html + # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-MonitorInstances.html # # ==== Parameters # * instance_ids<~Array> - Arrays of instances Ids to monitor @@ -14,9 +14,9 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: # * 'requestId'<~String> - Id of request - # * 'instancesSet': http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-ItemType-MonitorInstancesResponseSetItemType.html + # * 'instancesSet': http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-ItemType-MonitorInstancesResponseSetItemType.html # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-MonitorInstances.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-MonitorInstances.html] def monitor_instances(instance_ids) params = Fog::AWS.indexed_param('InstanceId', instance_ids) request({ diff --git a/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb b/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb index c0da97364..e5cad5c34 100644 --- a/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb +++ b/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/purchase_reserved_instances_offering' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'reservedInstancesId'<~String> - Id of the purchased reserved instances. # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-PurchaseReservedInstancesOffering.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-PurchaseReservedInstancesOffering.html] def purchase_reserved_instances_offering(reserved_instances_offering_id, instance_count = 1) request({ 'Action' => 'PurchaseReservedInstancesOffering', diff --git a/lib/fog/aws/requests/compute/reboot_instances.rb b/lib/fog/aws/requests/compute/reboot_instances.rb index 658454219..b68b62681 100644 --- a/lib/fog/aws/requests/compute/reboot_instances.rb +++ b/lib/fog/aws/requests/compute/reboot_instances.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-RebootInstances.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RebootInstances.html] def reboot_instances(instance_id = []) params = Fog::AWS.indexed_param('InstanceId', instance_id) request({ diff --git a/lib/fog/aws/requests/compute/register_image.rb b/lib/fog/aws/requests/compute/register_image.rb index 51eecff7d..032653f10 100644 --- a/lib/fog/aws/requests/compute/register_image.rb +++ b/lib/fog/aws/requests/compute/register_image.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/register_image' @@ -32,7 +32,7 @@ module Fog # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-RegisterImage.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RegisterImage.html] def register_image(name, description, location, block_devices=[], options={}) common_options = { diff --git a/lib/fog/aws/requests/compute/release_address.rb b/lib/fog/aws/requests/compute/release_address.rb index 2294d0669..2219b9895 100644 --- a/lib/fog/aws/requests/compute/release_address.rb +++ b/lib/fog/aws/requests/compute/release_address.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -12,7 +12,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-ReleaseAddress.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ReleaseAddress.html] # # non-VPC: requires public_ip only # VPC: requires allocation_id only diff --git a/lib/fog/aws/requests/compute/replace_network_acl_association.rb b/lib/fog/aws/requests/compute/replace_network_acl_association.rb index 4a7e36c9c..9be55a5fe 100644 --- a/lib/fog/aws/requests/compute/replace_network_acl_association.rb +++ b/lib/fog/aws/requests/compute/replace_network_acl_association.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/replace_network_acl_association' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-ReplaceNetworkAclAssociation.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ReplaceNetworkAclAssociation.html] def replace_network_acl_association(association_id, network_acl_id) request({ 'Action' => 'ReplaceNetworkAclAssociation', diff --git a/lib/fog/aws/requests/compute/replace_network_acl_entry.rb b/lib/fog/aws/requests/compute/replace_network_acl_entry.rb index c8624e46d..e434c6f60 100644 --- a/lib/fog/aws/requests/compute/replace_network_acl_entry.rb +++ b/lib/fog/aws/requests/compute/replace_network_acl_entry.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -25,7 +25,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - Returns true if the request succeeds. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-ReplaceNetworkAclEntry.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ReplaceNetworkAclEntry.html] def replace_network_acl_entry(network_acl_id, rule_number, protocol, rule_action, cidr_block, egress, options = {}) request({ 'Action' => 'ReplaceNetworkAclEntry', diff --git a/lib/fog/aws/requests/compute/replace_route.rb b/lib/fog/aws/requests/compute/replace_route.rb index e34f73247..d40144cac 100755 --- a/lib/fog/aws/requests/compute/replace_route.rb +++ b/lib/fog/aws/requests/compute/replace_route.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -20,7 +20,7 @@ module Fog # * 'requestId'<~String> - Id of the request # * 'return'<~Boolean> - Returns true if the request succeeds. Otherwise, returns an error. # - # {Amazon API Reference}[http://docs.aws.amazon.com/AwsEC2/latest/APIReference/ApiReference-query-ReplaceRoute.html] + # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ReplaceRoute.html] def replace_route(route_table_id, destination_cidr_block, options = {}) options['DestinationCidrBlock'] ||= destination_cidr_block diff --git a/lib/fog/aws/requests/compute/request_spot_instances.rb b/lib/fog/aws/requests/compute/request_spot_instances.rb index e4e8c2002..4d0d72ac7 100644 --- a/lib/fog/aws/requests/compute/request_spot_instances.rb +++ b/lib/fog/aws/requests/compute/request_spot_instances.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/spot_instance_requests' @@ -55,7 +55,7 @@ module Fog # * 'state'<~String> - spot instance request state # * 'type'<~String> - spot instance request type # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-RequestSpotInstances.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RequestSpotInstances.html] def request_spot_instances(image_id, instance_type, spot_price, options = {}) if block_device_mapping = options.delete('LaunchSpecification.BlockDeviceMapping') block_device_mapping.each_with_index do |mapping, index| diff --git a/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb b/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb index 0ab5751b0..a4790bced 100644 --- a/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb +++ b/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -16,7 +16,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/2012-03-01/APIReference/ApiReference-query-DescribeNetworkInterfaceAttribute.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/ApiReference-query-DescribeNetworkInterfaceAttribute.html] def reset_network_interface_attribute(network_interface_id, attribute) if attribute != 'sourceDestCheck' raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified") diff --git a/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb b/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb index 53e813152..bed017f32 100644 --- a/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb +++ b/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/basic' @@ -38,7 +38,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'return'<~Boolean> - success? # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-RevokeSecurityGroupIngress.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RevokeSecurityGroupIngress.html] def revoke_security_group_ingress(group_name, options = {}) options = Fog::AWS.parse_security_group_options(group_name, options) diff --git a/lib/fog/aws/requests/compute/run_instances.rb b/lib/fog/aws/requests/compute/run_instances.rb index e442e8c73..7b6848876 100644 --- a/lib/fog/aws/requests/compute/run_instances.rb +++ b/lib/fog/aws/requests/compute/run_instances.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/run_instances' @@ -102,7 +102,7 @@ module Fog # * 'requestId'<~String> - Id of request # * 'reservationId'<~String> - Id of reservation # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-RunInstances.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RunInstances.html] def run_instances(image_id, min_count, max_count, options = {}) if block_device_mapping = options.delete('BlockDeviceMapping') block_device_mapping.each_with_index do |mapping, index| diff --git a/lib/fog/aws/requests/compute/start_instances.rb b/lib/fog/aws/requests/compute/start_instances.rb index a48d2f4e5..d1df4f46a 100644 --- a/lib/fog/aws/requests/compute/start_instances.rb +++ b/lib/fog/aws/requests/compute/start_instances.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/start_stop_instances' @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * TODO: fill in the blanks # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-StartInstances.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-StartInstances.html] def start_instances(instance_id) params = Fog::AWS.indexed_param('InstanceId', instance_id) request({ diff --git a/lib/fog/aws/requests/compute/stop_instances.rb b/lib/fog/aws/requests/compute/stop_instances.rb index 7c4d845cb..7eceb338f 100644 --- a/lib/fog/aws/requests/compute/stop_instances.rb +++ b/lib/fog/aws/requests/compute/stop_instances.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/start_stop_instances' @@ -15,7 +15,7 @@ module Fog # * 'requestId'<~String> - Id of request # * TODO: fill in the blanks # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-StopInstances.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-StopInstances.html] def stop_instances(instance_id, force = false) params = Fog::AWS.indexed_param('InstanceId', instance_id) params.merge!('Force' => 'true') if force diff --git a/lib/fog/aws/requests/compute/terminate_instances.rb b/lib/fog/aws/requests/compute/terminate_instances.rb index 3e4947118..074d20537 100644 --- a/lib/fog/aws/requests/compute/terminate_instances.rb +++ b/lib/fog/aws/requests/compute/terminate_instances.rb @@ -1,6 +1,6 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/terminate_instances' @@ -22,7 +22,7 @@ module Fog # * 'code'<~Integer> - current status code # * 'name'<~String> - name of current state # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-TerminateInstances.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-TerminateInstances.html] def terminate_instances(instance_id) params = Fog::AWS.indexed_param('InstanceId', instance_id) request({ diff --git a/lib/fog/aws/requests/compute/unmonitor_instances.rb b/lib/fog/aws/requests/compute/unmonitor_instances.rb index e52d552d0..9b02308f5 100644 --- a/lib/fog/aws/requests/compute/unmonitor_instances.rb +++ b/lib/fog/aws/requests/compute/unmonitor_instances.rb @@ -1,11 +1,11 @@ module Fog module Compute - class Aws + class AWS class Real require 'fog/aws/parsers/compute/monitor_unmonitor_instances' # UnMonitor specified instance - # http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-UnmonitorInstances.html + # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-UnmonitorInstances.html # # ==== Parameters # * instance_ids<~Array> - Arrays of instances Ids to monitor @@ -14,9 +14,9 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: # * 'requestId'<~String> - Id of request - # * 'instancesSet': http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-ItemType-MonitorInstancesResponseSetItemType.html + # * 'instancesSet': http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-ItemType-MonitorInstancesResponseSetItemType.html # - # {Amazon API Reference}[http://docs.amazonwebservices.com/AwsEC2/latest/APIReference/ApiReference-query-UnmonitorInstances.html] + # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-UnmonitorInstances.html] def unmonitor_instances(instance_ids) params = Fog::AWS.indexed_param('InstanceId', instance_ids) request({ diff --git a/lib/fog/aws/requests/dns/change_resource_record_sets.rb b/lib/fog/aws/requests/dns/change_resource_record_sets.rb index cdeb6ed2b..981ae14f7 100644 --- a/lib/fog/aws/requests/dns/change_resource_record_sets.rb +++ b/lib/fog/aws/requests/dns/change_resource_record_sets.rb @@ -1,6 +1,6 @@ module Fog module DNS - class Aws + class AWS class Real require 'fog/aws/parsers/dns/change_resource_record_sets' @@ -61,7 +61,7 @@ module Fog # change_resource_record_sets("ABCDEFGHIJKLMN", change_batch_options) # def change_resource_record_sets(zone_id, change_batch, options = {}) - # Aws methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use + # AWS methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use # that form or just the actual id (which is what this request needs) zone_id = zone_id.sub('/hostedzone/', '') @@ -121,7 +121,7 @@ module Fog if change_item[:alias_target] # Accept either underscore or camel case for hash keys. dns_name = change_item[:alias_target][:dns_name] || change_item[:alias_target][:DNSName] - hosted_zone_id = change_item[:alias_target][:hosted_zone_id] || change_item[:alias_target][:HostedZoneId] || Aws.hosted_zone_for_alias_target(dns_name) + hosted_zone_id = change_item[:alias_target][:hosted_zone_id] || change_item[:alias_target][:HostedZoneId] || AWS.hosted_zone_for_alias_target(dns_name) evaluate_target_health = change_item[:alias_target][:evaluate_target_health] || change_item[:alias_target][:EvaluateTargetHealth] || false evaluate_target_health_xml = !evaluate_target_health.nil? ? %Q{#{evaluate_target_health}} : '' alias_target_tag += %Q{#{hosted_zone_id}#{dns_name}#{evaluate_target_health_xml}} diff --git a/lib/fog/aws/requests/dns/create_health_check.rb b/lib/fog/aws/requests/dns/create_health_check.rb index c1458744b..6f05a7905 100644 --- a/lib/fog/aws/requests/dns/create_health_check.rb +++ b/lib/fog/aws/requests/dns/create_health_check.rb @@ -1,6 +1,6 @@ module Fog module DNS - class Aws + class AWS class Real require 'fog/aws/parsers/dns/health_check' diff --git a/lib/fog/aws/requests/dns/create_hosted_zone.rb b/lib/fog/aws/requests/dns/create_hosted_zone.rb index 3f7c06e00..ad8218aae 100644 --- a/lib/fog/aws/requests/dns/create_hosted_zone.rb +++ b/lib/fog/aws/requests/dns/create_hosted_zone.rb @@ -1,6 +1,6 @@ module Fog module DNS - class Aws + class AWS class Real require 'fog/aws/parsers/dns/create_hosted_zone' diff --git a/lib/fog/aws/requests/dns/delete_health_check.rb b/lib/fog/aws/requests/dns/delete_health_check.rb index b1accc629..3efb2608a 100644 --- a/lib/fog/aws/requests/dns/delete_health_check.rb +++ b/lib/fog/aws/requests/dns/delete_health_check.rb @@ -1,6 +1,6 @@ module Fog module DNS - class Aws + class AWS class Real # This action deletes a health check. # http://docs.aws.amazon.com/Route53/latest/APIReference/API_DeleteHealthCheck.html diff --git a/lib/fog/aws/requests/dns/delete_hosted_zone.rb b/lib/fog/aws/requests/dns/delete_hosted_zone.rb index 60745a478..a783b87eb 100644 --- a/lib/fog/aws/requests/dns/delete_hosted_zone.rb +++ b/lib/fog/aws/requests/dns/delete_hosted_zone.rb @@ -1,6 +1,6 @@ module Fog module DNS - class Aws + class AWS class Real require 'fog/aws/parsers/dns/delete_hosted_zone' @@ -18,7 +18,7 @@ module Fog # * 'SubmittedAt'<~String> The date and time the change was made # * status<~Integer> - 200 when successful def delete_hosted_zone(zone_id) - # Aws methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use + # AWS methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use # that form or just the actual id (which is what this request needs) zone_id = zone_id.sub('/hostedzone/', '') diff --git a/lib/fog/aws/requests/dns/get_change.rb b/lib/fog/aws/requests/dns/get_change.rb index c9d608a8e..678513924 100644 --- a/lib/fog/aws/requests/dns/get_change.rb +++ b/lib/fog/aws/requests/dns/get_change.rb @@ -1,6 +1,6 @@ module Fog module DNS - class Aws + class AWS class Real require 'fog/aws/parsers/dns/get_change' @@ -17,7 +17,7 @@ module Fog # * 'SubmittedAt'<~String> # * status<~Integer> - 200 when successful def get_change(change_id) - # Aws methods return change_ids that looks like '/change/id'. Let the caller either use + # AWS methods return change_ids that looks like '/change/id'. Let the caller either use # that form or just the actual id (which is what this request needs) change_id = change_id.sub('/change/', '') diff --git a/lib/fog/aws/requests/dns/get_health_check.rb b/lib/fog/aws/requests/dns/get_health_check.rb index e1e6995b8..6bbc3d128 100644 --- a/lib/fog/aws/requests/dns/get_health_check.rb +++ b/lib/fog/aws/requests/dns/get_health_check.rb @@ -1,6 +1,6 @@ module Fog module DNS - class Aws + class AWS class Real require 'fog/aws/parsers/dns/health_check' diff --git a/lib/fog/aws/requests/dns/get_hosted_zone.rb b/lib/fog/aws/requests/dns/get_hosted_zone.rb index 3cefd0b9a..fbd72bc5e 100644 --- a/lib/fog/aws/requests/dns/get_hosted_zone.rb +++ b/lib/fog/aws/requests/dns/get_hosted_zone.rb @@ -1,6 +1,6 @@ module Fog module DNS - class Aws + class AWS class Real require 'fog/aws/parsers/dns/get_hosted_zone' @@ -21,7 +21,7 @@ module Fog # * 'NameServer'<~String> # * status<~Integer> - 200 when successful def get_hosted_zone(zone_id) - # Aws methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use + # AWS methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use # that form or just the actual id (which is what this request needs) zone_id = zone_id.sub('/hostedzone/', '') diff --git a/lib/fog/aws/requests/dns/list_health_checks.rb b/lib/fog/aws/requests/dns/list_health_checks.rb index b2e021508..6da1847c8 100644 --- a/lib/fog/aws/requests/dns/list_health_checks.rb +++ b/lib/fog/aws/requests/dns/list_health_checks.rb @@ -1,10 +1,10 @@ module Fog module DNS - class Aws + class AWS class Real require 'fog/aws/parsers/dns/list_health_checks' - # This action gets a list of the health checks that are associated with the current Aws account. + # This action gets a list of the health checks that are associated with the current AWS account. # http://docs.aws.amazon.com/Route53/latest/APIReference/API_ListHealthChecks.html # # === Returns diff --git a/lib/fog/aws/requests/dns/list_hosted_zones.rb b/lib/fog/aws/requests/dns/list_hosted_zones.rb index 013e42611..9efd26990 100644 --- a/lib/fog/aws/requests/dns/list_hosted_zones.rb +++ b/lib/fog/aws/requests/dns/list_hosted_zones.rb @@ -1,6 +1,6 @@ module Fog module DNS - class Aws + class AWS class Real require 'fog/aws/parsers/dns/list_hosted_zones' diff --git a/lib/fog/aws/requests/dns/list_resource_record_sets.rb b/lib/fog/aws/requests/dns/list_resource_record_sets.rb index a2b1c84c0..8333727d0 100644 --- a/lib/fog/aws/requests/dns/list_resource_record_sets.rb +++ b/lib/fog/aws/requests/dns/list_resource_record_sets.rb @@ -1,6 +1,6 @@ module Fog module DNS - class Aws + class AWS class Real require 'fog/aws/parsers/dns/list_resource_record_sets' @@ -33,7 +33,7 @@ module Fog # * 'NextRecordIdentifier'<~String> # * status<~Integer> - 201 when successful def list_resource_record_sets(zone_id, options = {}) - # Aws methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use + # AWS methods return zone_ids that looks like '/hostedzone/id'. Let the caller either use # that form or just the actual id (which is what this request needs) zone_id = zone_id.sub('/hostedzone/', '') diff --git a/lib/fog/aws/requests/elasticache/authorize_cache_security_group_ingress.rb b/lib/fog/aws/requests/elasticache/authorize_cache_security_group_ingress.rb index 93850a030..bf0567c94 100644 --- a/lib/fog/aws/requests/elasticache/authorize_cache_security_group_ingress.rb +++ b/lib/fog/aws/requests/elasticache/authorize_cache_security_group_ingress.rb @@ -9,7 +9,7 @@ module Fog # === Parameters # * name <~String> - The name of the cache security group # * ec2_name <~String> - The name of the EC2 security group to authorize - # * ec2_owner_id <~String> - The Aws Account Number of the EC2 security group + # * ec2_owner_id <~String> - The AWS Account Number of the EC2 security group # === Returns # * response <~Excon::Response>: # * body <~Hash> diff --git a/lib/fog/aws/requests/elasticache/revoke_cache_security_group_ingress.rb b/lib/fog/aws/requests/elasticache/revoke_cache_security_group_ingress.rb index f740eb96c..31bd39c9a 100644 --- a/lib/fog/aws/requests/elasticache/revoke_cache_security_group_ingress.rb +++ b/lib/fog/aws/requests/elasticache/revoke_cache_security_group_ingress.rb @@ -10,7 +10,7 @@ module Fog # === Parameters # * name <~String> - The name of the cache security group # * ec2_name <~String> - The name of the EC2 security group to revoke - # * ec2_owner_id <~String> - The Aws Account Number of the EC2 security group + # * ec2_owner_id <~String> - The AWS Account Number of the EC2 security group # === Returns # * response <~Excon::Response>: # * body <~Hash> diff --git a/lib/fog/aws/requests/elb/create_load_balancer.rb b/lib/fog/aws/requests/elb/create_load_balancer.rb index 69d0199fb..9724ce96b 100644 --- a/lib/fog/aws/requests/elb/create_load_balancer.rb +++ b/lib/fog/aws/requests/elb/create_load_balancer.rb @@ -154,7 +154,7 @@ module Fog 'BackendServerDescriptions' => [], # Hack to facilitate not updating the local data structure # (BackendServerDescriptions) until we do a subsequent - # describe as that is how Aws behaves. + # describe as that is how AWS behaves. 'BackendServerDescriptionsRemote' => [], 'Subnets' => options[:subnet_ids] || [], 'Scheme' => options[:scheme].nil? ? 'internet-facing' : options[:scheme], diff --git a/lib/fog/aws/requests/elb/create_load_balancer_policy.rb b/lib/fog/aws/requests/elb/create_load_balancer_policy.rb index 580d08373..5e4982d37 100644 --- a/lib/fog/aws/requests/elb/create_load_balancer_policy.rb +++ b/lib/fog/aws/requests/elb/create_load_balancer_policy.rb @@ -7,7 +7,7 @@ module Fog # Create Elastic Load Balancer Policy # # ==== Parameters - # * lb_name<~String> - The name associated with the LoadBalancer for which the policy is being created. This name must be unique within the client Aws account. + # * lb_name<~String> - The name associated with the LoadBalancer for which the policy is being created. This name must be unique within the client AWS account. # * attributes<~Hash> - A list of attributes associated with the policy being created. # * 'AttributeName'<~String> - The name of the attribute associated with the policy. # * 'AttributeValue'<~String> - The value of the attribute associated with the policy. diff --git a/lib/fog/aws/requests/glacier/abort_multipart_upload.rb b/lib/fog/aws/requests/glacier/abort_multipart_upload.rb index efd5d33e8..97c8ec06d 100644 --- a/lib/fog/aws/requests/glacier/abort_multipart_upload.rb +++ b/lib/fog/aws/requests/glacier/abort_multipart_upload.rb @@ -8,7 +8,7 @@ module Fog # * name<~String> Name of the vault to upload to # * upload_id<~String> The id of the upload to complete # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # diff --git a/lib/fog/aws/requests/glacier/complete_multipart_upload.rb b/lib/fog/aws/requests/glacier/complete_multipart_upload.rb index 450402470..293d146e1 100644 --- a/lib/fog/aws/requests/glacier/complete_multipart_upload.rb +++ b/lib/fog/aws/requests/glacier/complete_multipart_upload.rb @@ -10,7 +10,7 @@ module Fog # * total_size<~Integer> The total archive size # * tree_hash<~String> the treehash for the archive # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # diff --git a/lib/fog/aws/requests/glacier/create_archive.rb b/lib/fog/aws/requests/glacier/create_archive.rb index 1e06c8e7e..f1cabbb4c 100644 --- a/lib/fog/aws/requests/glacier/create_archive.rb +++ b/lib/fog/aws/requests/glacier/create_archive.rb @@ -9,7 +9,7 @@ module Fog # * body<~String> The data to upload # * options<~Hash> # * description<~String> - The archive description - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # diff --git a/lib/fog/aws/requests/glacier/create_vault.rb b/lib/fog/aws/requests/glacier/create_vault.rb index 78f07e4f0..fa1481a08 100644 --- a/lib/fog/aws/requests/glacier/create_vault.rb +++ b/lib/fog/aws/requests/glacier/create_vault.rb @@ -5,9 +5,9 @@ module Fog # This operation creates a new vault with the specified name. . # # ==== Parameters - # * name<~String> 1-255 characters. must be unique within a region for an Aws account + # * name<~String> 1-255 characters. must be unique within a region for an AWS account # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: diff --git a/lib/fog/aws/requests/glacier/delete_archive.rb b/lib/fog/aws/requests/glacier/delete_archive.rb index f65700653..a873b13ee 100644 --- a/lib/fog/aws/requests/glacier/delete_archive.rb +++ b/lib/fog/aws/requests/glacier/delete_archive.rb @@ -7,7 +7,7 @@ module Fog # ==== Parameters # * name<~String> Name of the vault to delete # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: diff --git a/lib/fog/aws/requests/glacier/delete_vault.rb b/lib/fog/aws/requests/glacier/delete_vault.rb index d4e4d61dc..5a15a7b19 100644 --- a/lib/fog/aws/requests/glacier/delete_vault.rb +++ b/lib/fog/aws/requests/glacier/delete_vault.rb @@ -8,7 +8,7 @@ module Fog # ==== Parameters # * name<~String> Name of the vault to delete # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # diff --git a/lib/fog/aws/requests/glacier/delete_vault_notification_configuration.rb b/lib/fog/aws/requests/glacier/delete_vault_notification_configuration.rb index 0c7a4a4f6..740f0fdd6 100644 --- a/lib/fog/aws/requests/glacier/delete_vault_notification_configuration.rb +++ b/lib/fog/aws/requests/glacier/delete_vault_notification_configuration.rb @@ -7,7 +7,7 @@ module Fog # ==== Parameters # * name<~String> Name of the vault # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # diff --git a/lib/fog/aws/requests/glacier/describe_job.rb b/lib/fog/aws/requests/glacier/describe_job.rb index 2d06873f0..c924c1610 100644 --- a/lib/fog/aws/requests/glacier/describe_job.rb +++ b/lib/fog/aws/requests/glacier/describe_job.rb @@ -8,7 +8,7 @@ module Fog # * name<~String> Name of the vault # * job_id<~String> The id of the job # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # diff --git a/lib/fog/aws/requests/glacier/describe_vault.rb b/lib/fog/aws/requests/glacier/describe_vault.rb index 4c680cb06..edb5eedec 100644 --- a/lib/fog/aws/requests/glacier/describe_vault.rb +++ b/lib/fog/aws/requests/glacier/describe_vault.rb @@ -7,7 +7,7 @@ module Fog # ==== Parameters # * name<~String> Vault name # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: diff --git a/lib/fog/aws/requests/glacier/get_job_output.rb b/lib/fog/aws/requests/glacier/get_job_output.rb index d5619a64a..c89f987c4 100644 --- a/lib/fog/aws/requests/glacier/get_job_output.rb +++ b/lib/fog/aws/requests/glacier/get_job_output.rb @@ -9,7 +9,7 @@ module Fog # * job_id<~String> The id of the job # * options<~Hash> # * Range<~Range> The range to retrieve - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # * response_block<~Proc> Proc to use for streaming the response # ==== Returns # * response<~Excon::Response>: diff --git a/lib/fog/aws/requests/glacier/get_vault_notification_configuration.rb b/lib/fog/aws/requests/glacier/get_vault_notification_configuration.rb index 817252867..03585fd59 100644 --- a/lib/fog/aws/requests/glacier/get_vault_notification_configuration.rb +++ b/lib/fog/aws/requests/glacier/get_vault_notification_configuration.rb @@ -7,7 +7,7 @@ module Fog # ==== Parameters # * name<~String> Name of the vault # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: diff --git a/lib/fog/aws/requests/glacier/initiate_job.rb b/lib/fog/aws/requests/glacier/initiate_job.rb index b36f71992..3f4edc5c5 100644 --- a/lib/fog/aws/requests/glacier/initiate_job.rb +++ b/lib/fog/aws/requests/glacier/initiate_job.rb @@ -13,7 +13,7 @@ module Fog # * Format<~String> The format to return (only for inventory retrieval). Values: CSV, JSON # * SNSTopic ARN of a topic to publish to when the job is complete # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: diff --git a/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb b/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb index 35150fdb0..cf545d466 100644 --- a/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb +++ b/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb @@ -9,7 +9,7 @@ module Fog # * part_size<~Integer> The part size to use. Must be a power of 2 multiple of 1MB (1,2,4,8,16,...) # * options<~Hash> # * description<~String> - The archive description - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: diff --git a/lib/fog/aws/requests/glacier/list_jobs.rb b/lib/fog/aws/requests/glacier/list_jobs.rb index dda2afb54..76461e451 100644 --- a/lib/fog/aws/requests/glacier/list_jobs.rb +++ b/lib/fog/aws/requests/glacier/list_jobs.rb @@ -11,7 +11,7 @@ module Fog # * statuscode<~String> Filter returned jobs by status (InProgress, Succeeded, or Failed) # * limit<~Integer> - The maximum number of items returned in the response. (default 1000) # * marker<~String> - marker used for pagination - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # ==== See Also diff --git a/lib/fog/aws/requests/glacier/list_multipart_uploads.rb b/lib/fog/aws/requests/glacier/list_multipart_uploads.rb index 77016cfe3..751aea628 100644 --- a/lib/fog/aws/requests/glacier/list_multipart_uploads.rb +++ b/lib/fog/aws/requests/glacier/list_multipart_uploads.rb @@ -9,7 +9,7 @@ module Fog # * options<~Hash> # * limit<~Integer> - The maximum number of items returned in the response. (default 1000) # * marker<~String> - marker used for pagination - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # ==== See Also diff --git a/lib/fog/aws/requests/glacier/list_parts.rb b/lib/fog/aws/requests/glacier/list_parts.rb index 148a58e0f..0c1b8d5d1 100644 --- a/lib/fog/aws/requests/glacier/list_parts.rb +++ b/lib/fog/aws/requests/glacier/list_parts.rb @@ -10,7 +10,7 @@ module Fog # * options<~Hash> # * limit<~Integer> - The maximum number of items returned in the response. (default 1000) # * marker<~String> - marker used for pagination - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # ==== See Also diff --git a/lib/fog/aws/requests/glacier/list_vaults.rb b/lib/fog/aws/requests/glacier/list_vaults.rb index 77aff047c..fc6d61100 100644 --- a/lib/fog/aws/requests/glacier/list_vaults.rb +++ b/lib/fog/aws/requests/glacier/list_vaults.rb @@ -8,7 +8,7 @@ module Fog # * options<~Hash> # * limit<~Integer> - The maximum number of items returned in the response. (default 1000) # * marker<~String> - marker used for pagination - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: diff --git a/lib/fog/aws/requests/glacier/set_vault_notification_configuration.rb b/lib/fog/aws/requests/glacier/set_vault_notification_configuration.rb index 2475fd6cc..dd9498dba 100644 --- a/lib/fog/aws/requests/glacier/set_vault_notification_configuration.rb +++ b/lib/fog/aws/requests/glacier/set_vault_notification_configuration.rb @@ -9,7 +9,7 @@ module Fog # * SnsTopic<~String> ARN of the topic to notify # * events<~Array> Events you wish to receive. Valid events are ArchiveRetrievalCompleted, InventoryRetrievalCompleted # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: diff --git a/lib/fog/aws/requests/glacier/upload_part.rb b/lib/fog/aws/requests/glacier/upload_part.rb index c68fefeb7..cba1ff1e2 100644 --- a/lib/fog/aws/requests/glacier/upload_part.rb +++ b/lib/fog/aws/requests/glacier/upload_part.rb @@ -11,7 +11,7 @@ module Fog # * offset<~Integer> The offset of the data within the archive # * hash<~String> The tree hash for this part # * options<~Hash> - # * account_id<~String> - The Aws account id. Defaults to the account owning the credentials making the request + # * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request # ==== Returns # * response<~Excon::Response>: # diff --git a/lib/fog/aws/requests/iam/create_access_key.rb b/lib/fog/aws/requests/iam/create_access_key.rb index da5d35690..fe189c690 100644 --- a/lib/fog/aws/requests/iam/create_access_key.rb +++ b/lib/fog/aws/requests/iam/create_access_key.rb @@ -32,7 +32,7 @@ module Fog end class Mock def create_access_key(options) - #FIXME: Not 100% correct as Aws will use the signing credentials when there is no 'UserName' in the options hash + #FIXME: Not 100% correct as AWS will use the signing credentials when there is no 'UserName' in the options hash # Also doesn't raise an error when there are too many keys if user = options['UserName'] if data[:users].key? user diff --git a/lib/fog/aws/requests/iam/create_role.rb b/lib/fog/aws/requests/iam/create_role.rb index ccf8bab59..d37f7df47 100644 --- a/lib/fog/aws/requests/iam/create_role.rb +++ b/lib/fog/aws/requests/iam/create_role.rb @@ -20,7 +20,7 @@ module Fog class Real require 'fog/aws/parsers/iam/single_role' - # Creates a new role for your Aws account + # Creates a new role for your AWS account # # ==== Parameters # * RoleName<~String>: name of the role to create diff --git a/lib/fog/aws/requests/iam/get_account_summary.rb b/lib/fog/aws/requests/iam/get_account_summary.rb index 773abd266..8a56a0da3 100644 --- a/lib/fog/aws/requests/iam/get_account_summary.rb +++ b/lib/fog/aws/requests/iam/get_account_summary.rb @@ -14,23 +14,23 @@ module Fog # * 'AccountMFAEnabled'<~Integer> - 1 if the root account has an MFA device assigned to it, 0 otherwise # * 'AssumeRolePolicySizeQuota'<~Integer> - Maximum allowed size for assume role policy documents (in kilobytes) # * 'GroupPolicySizeQuota'<~Integer> - Maximum allowed size for Group policy documents (in kilobytes) - # * 'Groups'<~Integer> - Number of Groups for the Aws account + # * 'Groups'<~Integer> - Number of Groups for the AWS account # * 'GroupsPerUserQuota'<~Integer> - Maximum number of groups a user can belong to - # * 'GroupsQuota'<~Integer> - Maximum groups allowed for the Aws account - # * 'InstanceProfiles'<~Integer> - Number of instance profiles for the Aws account - # * 'InstanceProfilesQuota'<~Integer> - Maximum instance profiles allowed for the Aws account + # * 'GroupsQuota'<~Integer> - Maximum groups allowed for the AWS account + # * 'InstanceProfiles'<~Integer> - Number of instance profiles for the AWS account + # * 'InstanceProfilesQuota'<~Integer> - Maximum instance profiles allowed for the AWS account # * 'MFADevices'<~Integer> - Number of MFA devices, either assigned or unassigned # * 'MFADevicesInUse'<~Integer> - Number of MFA devices that have been assigned to an IAM user or to the root account # * 'Providers'<~Integer> - # * 'RolePolicySizeQuota'<~Integer> - Maximum allowed size for role policy documents (in kilobytes) - # * 'Roles'<~Integer> - Number of roles for the Aws account - # * 'RolesQuota'<~Integer> - Maximum roles allowed for the Aws account - # * 'ServerCertificates'<~Integer> - Number of server certificates for the Aws account - # * 'ServerCertificatesQuota'<~Integer> - Maximum server certificates allowed for the Aws account + # * 'Roles'<~Integer> - Number of roles for the AWS account + # * 'RolesQuota'<~Integer> - Maximum roles allowed for the AWS account + # * 'ServerCertificates'<~Integer> - Number of server certificates for the AWS account + # * 'ServerCertificatesQuota'<~Integer> - Maximum server certificates allowed for the AWS account # * 'SigningCertificatesPerUserQuota'<~Integer> - Maximum number of X509 certificates allowed for a user # * 'UserPolicySizeQuota'<~Integer> - Maximum allowed size for user policy documents (in kilobytes) - # * 'Users'<~Integer> - Number of users for the Aws account - # * 'UsersQuota'<~Integer> - Maximum users allowed for the Aws account + # * 'Users'<~Integer> - Number of users for the AWS account + # * 'UsersQuota'<~Integer> - Maximum users allowed for the AWS account # * 'RequestId'<~String> - Id of the request # # ==== See Also diff --git a/lib/fog/aws/requests/iam/upload_server_certificate.rb b/lib/fog/aws/requests/iam/upload_server_certificate.rb index cd8ee3ecd..d3e505dbf 100644 --- a/lib/fog/aws/requests/iam/upload_server_certificate.rb +++ b/lib/fog/aws/requests/iam/upload_server_certificate.rb @@ -4,7 +4,7 @@ module Fog class Real require 'fog/aws/parsers/iam/upload_server_certificate' - # Uploads a server certificate entity for the Aws Account. + # Uploads a server certificate entity for the AWS Account. # Includes a public key certificate, a private key, and an optional certificate chain, which should all be PEM-encoded. # # ==== Parameters diff --git a/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb b/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb index 5c3135144..b39ba07ab 100644 --- a/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb +++ b/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb @@ -10,7 +10,7 @@ module Fog # * CIDRIP <~String> - The IP range to authorize # * DBSecurityGroupName <~String> - The name for the DB Security Group. # * EC2SecurityGroupName <~String> - Name of the EC2 Security Group to authorize. - # * EC2SecurityGroupOwnerId <~String> - Aws Account Number of the owner of the security group specified in the EC2SecurityGroupName parameter. The Aws Access Key ID is not an acceptable value. + # * EC2SecurityGroupOwnerId <~String> - AWS Account Number of the owner of the security group specified in the EC2SecurityGroupName parameter. The AWS Access Key ID is not an acceptable value. # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: diff --git a/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb b/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb index 87ffda3cc..a3174f199 100644 --- a/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb +++ b/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb @@ -10,7 +10,7 @@ module Fog # * CIDRIP <~String> - The IP range to revoke # * DBSecurityGroupName <~String> - The name for the DB Security Group. # * EC2SecurityGroupName <~String> - Name of the EC2 Security Group to revoke. - # * EC2SecurityGroupOwnerId <~String> - Aws Account Number of the owner of the security group specified in the EC2SecurityGroupName parameter. The Aws Access Key ID is not an acceptable value. + # * EC2SecurityGroupOwnerId <~String> - AWS Account Number of the owner of the security group specified in the EC2SecurityGroupName parameter. The AWS Access Key ID is not an acceptable value. # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: diff --git a/lib/fog/aws/requests/redshift/authorize_cluster_security_group_ingress.rb b/lib/fog/aws/requests/redshift/authorize_cluster_security_group_ingress.rb index 0c1ca58e2..f03b29311 100644 --- a/lib/fog/aws/requests/redshift/authorize_cluster_security_group_ingress.rb +++ b/lib/fog/aws/requests/redshift/authorize_cluster_security_group_ingress.rb @@ -18,8 +18,8 @@ module Fog # EC2SecurityGroupName is specified, EC2SecurityGroupOwnerId must also be # provided and CIDRIP cannot be provided. # * :ec2_security_group_owner_id - (String) - # The Aws account number of the owner of the security group specified in the - # EC2SecurityGroupName parameter. The Aws access key ID is not an acceptable + # The AWS account number of the owner of the security group specified in the + # EC2SecurityGroupName parameter. The AWS access key ID is not an acceptable # value. If EC2SecurityGroupOwnerId is specified, EC2SecurityGroupName must # also be provided. and CIDRIP cannot be provided. Example: 111122223333 # diff --git a/lib/fog/aws/requests/redshift/authorize_snapshot_access.rb b/lib/fog/aws/requests/redshift/authorize_snapshot_access.rb index 4372edfb4..384891081 100644 --- a/lib/fog/aws/requests/redshift/authorize_snapshot_access.rb +++ b/lib/fog/aws/requests/redshift/authorize_snapshot_access.rb @@ -11,7 +11,7 @@ module Fog # The identifier of the snapshot the account is authorized to restore. # * :snapshot_cluster_identifier - (String) # * :account_with_restore_access - required - (String) - # The identifier of the Aws customer account authorized to restore the specified snapshot. # + # The identifier of the AWS customer account authorized to restore the specified snapshot. # # # ==== See Also # http://docs.aws.amazon.com/redshift/latest/APIReference/API_CopyClusterSnapshot.html diff --git a/lib/fog/aws/requests/redshift/copy_cluster_snapshot.rb b/lib/fog/aws/requests/redshift/copy_cluster_snapshot.rb index 7f18bdea8..630b9af90 100644 --- a/lib/fog/aws/requests/redshift/copy_cluster_snapshot.rb +++ b/lib/fog/aws/requests/redshift/copy_cluster_snapshot.rb @@ -15,7 +15,7 @@ module Fog # The identifier given to the new manual snapshot. Constraints: Cannot be null, # empty, or blank. Must contain from 1 to 255 alphanumeric characters or hyphens. # First character must be a letter. Cannot end with a hyphen or contain two - # consecutive hyphens. Must be unique for the Aws account that is making the request. + # consecutive hyphens. Must be unique for the AWS account that is making the request. # # ==== See Also # http://docs.aws.amazon.com/redshift/latest/APIReference/API_CopyClusterSnapshot.html diff --git a/lib/fog/aws/requests/redshift/create_cluster.rb b/lib/fog/aws/requests/redshift/create_cluster.rb index 47cb8133c..5d6b24c52 100644 --- a/lib/fog/aws/requests/redshift/create_cluster.rb +++ b/lib/fog/aws/requests/redshift/create_cluster.rb @@ -15,7 +15,7 @@ module Fog # * :cluster_identifier - required - (String) # A unique identifier for the cluster. You use this identifier to refer to the cluster # for any subsequent cluster operations such as deleting or modifying. Must be unique - # for all clusters within an Aws account. Example: myexamplecluster + # for all clusters within an AWS account. Example: myexamplecluster # * :cluster_type - (String) # Type of the cluster. When cluster type is specified as single-node, the NumberOfNodes # parameter is not required. multi-node, the NumberOfNodes parameter is required. Valid diff --git a/lib/fog/aws/requests/redshift/create_cluster_parameter_group.rb b/lib/fog/aws/requests/redshift/create_cluster_parameter_group.rb index 3965d1289..fce5225ac 100644 --- a/lib/fog/aws/requests/redshift/create_cluster_parameter_group.rb +++ b/lib/fog/aws/requests/redshift/create_cluster_parameter_group.rb @@ -10,13 +10,13 @@ module Fog # * :parameter_group_name - required - (String) # The name of the cluster parameter group. Constraints: Must be 1 to 255 alphanumeric # characters or hyphens First character must be a letter. Cannot end with a hyphen or - # contain two consecutive hyphens. Must be unique within your Aws account. This value + # contain two consecutive hyphens. Must be unique within your AWS account. This value # is stored as a lower-case string. # * :parameter_group_family - required - (String) # The Amazon Redshift engine version to which the cluster parameter group applies. The # cluster engine version determines the set of parameters. To get a list of valid parameter # group family names, you can call DescribeClusterParameterGroups. By default, Amazon - # Redshift returns a list of all the parameter groups that are owned by your Aws account, + # Redshift returns a list of all the parameter groups that are owned by your AWS account, # including the default parameter groups for each Amazon Redshift engine version. The # parameter group family names associated with the default parameter groups provide you # the valid values. For example, a valid family name is "redshift-1.0". diff --git a/lib/fog/aws/requests/redshift/create_cluster_snapshot.rb b/lib/fog/aws/requests/redshift/create_cluster_snapshot.rb index c91826f5d..2d050435e 100644 --- a/lib/fog/aws/requests/redshift/create_cluster_snapshot.rb +++ b/lib/fog/aws/requests/redshift/create_cluster_snapshot.rb @@ -9,7 +9,7 @@ module Fog # @param [Hash] options # * :snapshot_identifier - required - (String) # A unique identifier for the snapshot that you are requesting. This identifier - # must be unique for all snapshots within the Aws account. Constraints: Cannot be + # must be unique for all snapshots within the AWS account. Constraints: Cannot be # null, empty, or blank Must contain from 1 to 255 alphanumeric characters or # hyphens First character must be a letter Cannot end with a hyphen or contain two # consecutive hyphens Example: my-snapshot-id diff --git a/lib/fog/aws/requests/redshift/create_cluster_subnet_group.rb b/lib/fog/aws/requests/redshift/create_cluster_subnet_group.rb index 6d1cca4ae..fdeb13050 100644 --- a/lib/fog/aws/requests/redshift/create_cluster_subnet_group.rb +++ b/lib/fog/aws/requests/redshift/create_cluster_subnet_group.rb @@ -10,7 +10,7 @@ module Fog # * :cluster_subnet_group_name - required - (String) # The name for the subnet group. Amazon Redshift stores the value as a lowercase string. # Constraints: Must contain no more than 255 alphanumeric characters or hyphens. Must not - # be "Default". Must be unique for all subnet groups that are created by your Aws account. + # be "Default". Must be unique for all subnet groups that are created by your AWS account. # Example: examplesubnetgroup # * :description - required - (String) # A description of the parameter group. diff --git a/lib/fog/aws/requests/redshift/delete_cluster.rb b/lib/fog/aws/requests/redshift/delete_cluster.rb index 9788e0e05..79eac199b 100644 --- a/lib/fog/aws/requests/redshift/delete_cluster.rb +++ b/lib/fog/aws/requests/redshift/delete_cluster.rb @@ -10,7 +10,7 @@ module Fog # * :cluster_identifier - required - (String) # A unique identifier for the cluster. You use this identifier to refer to the cluster # for any subsequent cluster operations such as deleting or modifying. Must be unique - # for all clusters within an Aws account. Example: myexamplecluster + # for all clusters within an AWS account. Example: myexamplecluster # * :skip_final_cluster_snapshot - (Boolean) # Determines whether a final snapshot of the cluster is created before Amazon Redshift # deletes the cluster. If `true` , a final cluster snapshot is not created. If `false`, diff --git a/lib/fog/aws/requests/redshift/delete_cluster_snapshot.rb b/lib/fog/aws/requests/redshift/delete_cluster_snapshot.rb index f06431457..659c6f086 100644 --- a/lib/fog/aws/requests/redshift/delete_cluster_snapshot.rb +++ b/lib/fog/aws/requests/redshift/delete_cluster_snapshot.rb @@ -9,7 +9,7 @@ module Fog # @param [Hash] options # * :snapshot_identifier - required - (String) # A unique identifier for the snapshot that you are requesting. This identifier - # must be unique for all snapshots within the Aws account. Constraints: Cannot be + # must be unique for all snapshots within the AWS account. Constraints: Cannot be # null, empty, or blank Must contain from 1 to 255 alphanumeric characters or # hyphens First character must be a letter Cannot end with a hyphen or contain two # consecutive hyphens Example: my-snapshot-id diff --git a/lib/fog/aws/requests/redshift/delete_cluster_subnet_group.rb b/lib/fog/aws/requests/redshift/delete_cluster_subnet_group.rb index 0883107fe..2e1c17bb6 100644 --- a/lib/fog/aws/requests/redshift/delete_cluster_subnet_group.rb +++ b/lib/fog/aws/requests/redshift/delete_cluster_subnet_group.rb @@ -8,7 +8,7 @@ module Fog # * :cluster_subnet_group_name - required - (String) # The name for the subnet group. Amazon Redshift stores the value as a lowercase string. # Constraints: Must contain no more than 255 alphanumeric characters or hyphens. Must not - # be "Default". Must be unique for all subnet groups that are created by your Aws account. + # be "Default". Must be unique for all subnet groups that are created by your AWS account. # Example: examplesubnetgroup # # ==== See Also diff --git a/lib/fog/aws/requests/redshift/describe_cluster_snapshots.rb b/lib/fog/aws/requests/redshift/describe_cluster_snapshots.rb index 008d91ebe..16be7a52d 100644 --- a/lib/fog/aws/requests/redshift/describe_cluster_snapshots.rb +++ b/lib/fog/aws/requests/redshift/describe_cluster_snapshots.rb @@ -23,9 +23,9 @@ module Fog # time. The time value is specified in ISO 8601 format. For more information # about ISO 8601, go to the ISO8601 Wikipedia page. Example: 2012-07-16T18:00:00Z # * :owner_account - (String) - # The Aws customer account used to create or copy the snapshot. Use this field to + # The AWS customer account used to create or copy the snapshot. Use this field to # filter the results to snapshots owned by a particular account. To describe snapshots - # you own, either specify your Aws customer account, or do not specify the parameter. + # you own, either specify your AWS customer account, or do not specify the parameter. # * :max_records - (Integer) # The maximum number of records to include in the response. If more than the # MaxRecords value is available, a marker is included in the response so that the diff --git a/lib/fog/aws/requests/redshift/describe_resize.rb b/lib/fog/aws/requests/redshift/describe_resize.rb index 82bd74e1e..a2abf8d34 100644 --- a/lib/fog/aws/requests/redshift/describe_resize.rb +++ b/lib/fog/aws/requests/redshift/describe_resize.rb @@ -10,7 +10,7 @@ module Fog # * :cluster_identifier - required - (String) # The unique identifier of a cluster whose resize progress you are requesting. # This parameter isn't case-sensitive. By default, resize operations for all - # clusters defined for an Aws account are returned. + # clusters defined for an AWS account are returned. # # ==== See Also # http://docs.aws.amazon.com/redshift/latest/APIReference/API_DescribeResize.html diff --git a/lib/fog/aws/requests/redshift/modify_cluster.rb b/lib/fog/aws/requests/redshift/modify_cluster.rb index 7562dbf6c..d3687146d 100644 --- a/lib/fog/aws/requests/redshift/modify_cluster.rb +++ b/lib/fog/aws/requests/redshift/modify_cluster.rb @@ -10,7 +10,7 @@ module Fog # * :cluster_identifier - required - (String) # A unique identifier for the cluster. You use this identifier to refer to the cluster # for any subsequent cluster operations such as deleting or modifying. Must be unique - # for all clusters within an Aws account. Example: myexamplecluster + # for all clusters within an AWS account. Example: myexamplecluster # * :allow_version_upgrade - (Boolean) # If `true` , upgrades can be applied during the maintenance window to the Amazon # Redshift engine that is running on the cluster. Default: `true` diff --git a/lib/fog/aws/requests/redshift/modify_cluster_subnet_group.rb b/lib/fog/aws/requests/redshift/modify_cluster_subnet_group.rb index 5a62a2819..2ef3dccf6 100644 --- a/lib/fog/aws/requests/redshift/modify_cluster_subnet_group.rb +++ b/lib/fog/aws/requests/redshift/modify_cluster_subnet_group.rb @@ -10,7 +10,7 @@ module Fog # * :cluster_subnet_group_name - required - (String) # The name for the subnet group. Amazon Redshift stores the value as a lowercase string. # Constraints: Must contain no more than 255 alphanumeric characters or hyphens. Must not - # be "Default". Must be unique for all subnet groups that are created by your Aws account. + # be "Default". Must be unique for all subnet groups that are created by your AWS account. # Example: examplesubnetgroup # * :description - required - (String) # A description of the parameter group. diff --git a/lib/fog/aws/requests/redshift/reboot_cluster.rb b/lib/fog/aws/requests/redshift/reboot_cluster.rb index e5147864b..3ac34906e 100644 --- a/lib/fog/aws/requests/redshift/reboot_cluster.rb +++ b/lib/fog/aws/requests/redshift/reboot_cluster.rb @@ -10,7 +10,7 @@ module Fog # * :cluster_identifier - required - (String) # A unique identifier for the cluster. You use this identifier to refer to the cluster # for any subsequent cluster operations such as deleting or modifying. Must be unique - # for all clusters within an Aws account. Example: myexamplecluster + # for all clusters within an AWS account. Example: myexamplecluster # # ==== See Also # http://docs.aws.amazon.com/redshift/latest/APIReference/API_DeleteCluster.html diff --git a/lib/fog/aws/requests/redshift/restore_from_cluster_snapshot.rb b/lib/fog/aws/requests/redshift/restore_from_cluster_snapshot.rb index 7de57ff0c..ff30d1496 100644 --- a/lib/fog/aws/requests/redshift/restore_from_cluster_snapshot.rb +++ b/lib/fog/aws/requests/redshift/restore_from_cluster_snapshot.rb @@ -12,7 +12,7 @@ module Fog # Constraints: Must contain from 1 to 63 alphanumeric characters or hyphens. # Alphabetic characters must be lowercase. First character must be a letter. Cannot # end with a hyphen or contain two consecutive hyphens. Must be unique for all - # clusters within an Aws account. + # clusters within an AWS account. # * :snapshot_identifier - required - (String) # The name of the snapshot from which to create the new cluster. This parameter # isn't case sensitive. Example: my-snapshot-id @@ -33,7 +33,7 @@ module Fog # * :publicly_accessible - (Boolean) # If true , the cluster can be accessed from a public network. # * :owner_account - (String) - # The Aws customer account used to create or copy the snapshot. Required if you are + # The AWS customer account used to create or copy the snapshot. Required if you are # restoring a snapshot you do not own, optional if you own the snapshot. # # ==== See Also diff --git a/lib/fog/aws/requests/redshift/revoke_cluster_security_group_ingress.rb b/lib/fog/aws/requests/redshift/revoke_cluster_security_group_ingress.rb index cb9287bca..2432720a1 100644 --- a/lib/fog/aws/requests/redshift/revoke_cluster_security_group_ingress.rb +++ b/lib/fog/aws/requests/redshift/revoke_cluster_security_group_ingress.rb @@ -18,8 +18,8 @@ module Fog # EC2SecurityGroupName is specified, EC2SecurityGroupOwnerId must also be # provided and CIDRIP cannot be provided. # * :ec2_security_group_owner_id - (String) - # The Aws account number of the owner of the security group specified in the - # EC2SecurityGroupName parameter. The Aws access key ID is not an acceptable + # The AWS account number of the owner of the security group specified in the + # EC2SecurityGroupName parameter. The AWS access key ID is not an acceptable # value. If EC2SecurityGroupOwnerId is specified, EC2SecurityGroupName must # also be provided. and CIDRIP cannot be provided. Example: 111122223333 # diff --git a/lib/fog/aws/requests/redshift/revoke_snapshot_access.rb b/lib/fog/aws/requests/redshift/revoke_snapshot_access.rb index fbb54facd..9e7f1e6e0 100644 --- a/lib/fog/aws/requests/redshift/revoke_snapshot_access.rb +++ b/lib/fog/aws/requests/redshift/revoke_snapshot_access.rb @@ -11,7 +11,7 @@ module Fog # The identifier of the snapshot that the account can no longer access. # * :snapshot_cluster_identifier - (String) # * :account_with_restore_access - required - (String) - # The identifier of the Aws customer account that can no longer restore the specified snapshot. + # The identifier of the AWS customer account that can no longer restore the specified snapshot. # # ==== See Also # http://docs.aws.amazon.com/redshift/latest/APIReference/API_RevokeSnapshotAccess.html diff --git a/lib/fog/aws/requests/sns/create_topic.rb b/lib/fog/aws/requests/sns/create_topic.rb index bfb2a42b0..027612bf9 100644 --- a/lib/fog/aws/requests/sns/create_topic.rb +++ b/lib/fog/aws/requests/sns/create_topic.rb @@ -36,7 +36,7 @@ module Fog "DisplayName" => name, "TopicArn" => topic_arn, "EffectiveDeliveryPolicy" => %Q|{"http":{"defaultHealthyRetryPolicy":{"minDelayTarget":20,"maxDelayTarget":20,"numRetries":3,"numMaxDelayRetries":0,"numNoDelayRetries":0,"numMinDelayRetries":0,"backoffFunction":"linear"},"disableSubscriptionOverrides":false}}|, - "Policy" => %Q|{"Version":"2008-10-17","Id":"__default_policy_ID","Statement":[{"Sid":"__default_statement_ID","Effect":"Allow","Principal":{"Aws":"*"},"Action":["SNS:Publish","SNS:RemovePermission","SNS:SetTopicAttributes","SNS:DeleteTopic","SNS:ListSubscriptionsByTopic","SNS:GetTopicAttributes","SNS:Receive","SNS:AddPermission","SNS:Subscribe"],"Resource":"arn:aws:sns:us-east-1:990279267269:Smithy","Condition":{"StringEquals":{"Aws:SourceOwner":"990279267269"}}}]}| + "Policy" => %Q|{"Version":"2008-10-17","Id":"__default_policy_ID","Statement":[{"Sid":"__default_statement_ID","Effect":"Allow","Principal":{"AWS":"*"},"Action":["SNS:Publish","SNS:RemovePermission","SNS:SetTopicAttributes","SNS:DeleteTopic","SNS:ListSubscriptionsByTopic","SNS:GetTopicAttributes","SNS:Receive","SNS:AddPermission","SNS:Subscribe"],"Resource":"arn:aws:sns:us-east-1:990279267269:Smithy","Condition":{"StringEquals":{"AWS:SourceOwner":"990279267269"}}}]}| } response.body = {"TopicArn" => topic_arn, "RequestId" => Fog::AWS::Mock.request_id} response diff --git a/lib/fog/aws/requests/sns/subscribe.rb b/lib/fog/aws/requests/sns/subscribe.rb index 49605db44..1cf22931b 100644 --- a/lib/fog/aws/requests/sns/subscribe.rb +++ b/lib/fog/aws/requests/sns/subscribe.rb @@ -51,31 +51,6 @@ module Fog "Endpoint" => endpoint, } - access_key, _ = Fog::AWS::SQS.data.values.find { |_, data| !!data[:queues][endpoint] } - - if protocol == "sqs" && access_key - token = SecureRandom.hex(128) - message = "You have chosen to subscribe to the topic #{arn}.\nTo confirm the subscription, visit the SubscribeURL included in this message." - signature = Fog::HMAC.new("sha256", token).sign(message) - - Fog::AWS::SQS.new( - :region => self.region, - :aws_access_key_id => access_key, - :aws_secret_access_key => @aws_secret_access_key, - ).send_message(endpoint, { - "Type" => "SubscriptionConfirmation", - "MessageId" => SecureRandom.uuid, - "Token" => token, - "TopicArn" => arn, - "Message" => message, - "SubscribeURL" => "https://sns.#{self.region}.amazonaws.com/?Action=ConfirmSubscription&TopicArn=#{arn}&Token=#{token}", - "Timestamp" => Time.now.iso8601, - "SignatureVersion" => "1", - "Signature" => signature, - "SigningCertURL" => "https://sns.#{self.region}.amazonaws.com/SimpleNotificationService-#{SecureRandom.hex(16)}.pem" - }) - end - response.body = { 'SubscriptionArn' => 'pending confirmation', 'RequestId' => Fog::AWS::Mock.request_id } response end diff --git a/lib/fog/aws/requests/sqs/change_message_visibility.rb b/lib/fog/aws/requests/sqs/change_message_visibility.rb index 017f033c8..c74806795 100644 --- a/lib/fog/aws/requests/sqs/change_message_visibility.rb +++ b/lib/fog/aws/requests/sqs/change_message_visibility.rb @@ -12,7 +12,7 @@ module Fog # * visibility_timeout<~Integer> - New visibility timeout in 0..43200 # # ==== See Also - # http://docs.amazonwebservices.com/AwsSimpleQueueService/latest/APIReference/Query_QueryChangeMessageVisibility.html + # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QueryChangeMessageVisibility.html # def change_message_visibility(queue_url, receipt_handle, visibility_timeout) diff --git a/lib/fog/aws/requests/sqs/create_queue.rb b/lib/fog/aws/requests/sqs/create_queue.rb index f7da618d0..76f34a9fd 100644 --- a/lib/fog/aws/requests/sqs/create_queue.rb +++ b/lib/fog/aws/requests/sqs/create_queue.rb @@ -12,7 +12,7 @@ module Fog # * DefaultVisibilityTimeout<~String> - Time, in seconds, to hide a message after it has been received, in 0..43200, defaults to 30 # # ==== See Also - # http://docs.amazonwebservices.com/AwsSimpleQueueService/latest/APIReference/Query_QueryCreateQueue.html + # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QueryCreateQueue.html # def create_queue(name, options = {}) diff --git a/lib/fog/aws/requests/sqs/delete_message.rb b/lib/fog/aws/requests/sqs/delete_message.rb index 8948990d1..e1a2b873e 100644 --- a/lib/fog/aws/requests/sqs/delete_message.rb +++ b/lib/fog/aws/requests/sqs/delete_message.rb @@ -11,7 +11,7 @@ module Fog # * receipt_handle<~String> - Token from previous recieve message # # ==== See Also - # http://docs.amazonwebservices.com/AwsSimpleQueueService/latest/APIReference/Query_QueryDeleteMessage.html + # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QueryDeleteMessage.html # def delete_message(queue_url, receipt_handle) diff --git a/lib/fog/aws/requests/sqs/delete_queue.rb b/lib/fog/aws/requests/sqs/delete_queue.rb index c521bae92..0640ad369 100644 --- a/lib/fog/aws/requests/sqs/delete_queue.rb +++ b/lib/fog/aws/requests/sqs/delete_queue.rb @@ -10,7 +10,7 @@ module Fog # * queue_url<~String> - Url of queue to delete # # ==== See Also - # http://docs.amazonwebservices.com/AwsSimpleQueueService/latest/APIReference/Query_QueryDeleteQueue.html + # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QueryDeleteQueue.html # def delete_queue(queue_url) diff --git a/lib/fog/aws/requests/sqs/get_queue_attributes.rb b/lib/fog/aws/requests/sqs/get_queue_attributes.rb index 511903d8a..7e5379994 100644 --- a/lib/fog/aws/requests/sqs/get_queue_attributes.rb +++ b/lib/fog/aws/requests/sqs/get_queue_attributes.rb @@ -11,7 +11,7 @@ module Fog # * attribute_name<~Array> - Name of attribute to return, in ['All', 'ApproximateNumberOfMessages', 'ApproximateNumberOfMessagesNotVisible', 'CreatedTimestamp', 'LastModifiedTimestamp', 'MaximumMessageSize', 'MessageRetentionPeriod', 'Policy', 'QueueArn', 'VisibilityTimeout'] # # ==== See Also - # http://docs.amazonwebservices.com/AwsSimpleQueueService/latest/APIReference/Query_QueryGetQueueAttributes.html + # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QueryGetQueueAttributes.html # def get_queue_attributes(queue_url, attribute_name) diff --git a/lib/fog/aws/requests/sqs/list_queues.rb b/lib/fog/aws/requests/sqs/list_queues.rb index cf3a920ba..416a57469 100644 --- a/lib/fog/aws/requests/sqs/list_queues.rb +++ b/lib/fog/aws/requests/sqs/list_queues.rb @@ -11,7 +11,7 @@ module Fog # * QueueNamePrefix<~String> - String used to filter results to only those with matching prefixes # # ==== See Also - # http://docs.amazonwebservices.com/AwsSimpleQueueService/latest/APIReference/Query_QueryListQueues.html + # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QueryListQueues.html # def list_queues(options = {}) diff --git a/lib/fog/aws/requests/sqs/receive_message.rb b/lib/fog/aws/requests/sqs/receive_message.rb index 81f995634..ba1096467 100644 --- a/lib/fog/aws/requests/sqs/receive_message.rb +++ b/lib/fog/aws/requests/sqs/receive_message.rb @@ -14,7 +14,7 @@ module Fog # * VisibilityTimeout<~Integer> - Duration, in seconds, to hide message from other receives. In 0..43200, defaults to visibility timeout for queue # # ==== See Also - # http://docs.amazonwebservices.com/AwsSimpleQueueService/latest/APIReference/Query_QueryReceiveMessage.html + # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QueryReceiveMessage.html # def receive_message(queue_url, options = {}) diff --git a/lib/fog/aws/requests/sqs/send_message.rb b/lib/fog/aws/requests/sqs/send_message.rb index 8126cc0d1..728bdd695 100644 --- a/lib/fog/aws/requests/sqs/send_message.rb +++ b/lib/fog/aws/requests/sqs/send_message.rb @@ -11,7 +11,7 @@ module Fog # * message<~String> - Message to add to queue # # ==== See Also - # http://docs.amazonwebservices.com/AwsSimpleQueueService/latest/APIReference/Query_QuerySendMessage.html + # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QuerySendMessage.html # def send_message(queue_url, message) diff --git a/lib/fog/aws/requests/sqs/set_queue_attributes.rb b/lib/fog/aws/requests/sqs/set_queue_attributes.rb index 778d44fb0..41e34dd37 100644 --- a/lib/fog/aws/requests/sqs/set_queue_attributes.rb +++ b/lib/fog/aws/requests/sqs/set_queue_attributes.rb @@ -12,7 +12,7 @@ module Fog # * attribute_value<~String> - Value to set for attribute # # ==== See Also - # http://docs.amazonwebservices.com/AwsSimpleQueueService/latest/APIReference/Query_QuerySetQueueAttributes.html + # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QuerySetQueueAttributes.html # def set_queue_attributes(queue_url, attribute_name, attribute_value) diff --git a/lib/fog/aws/requests/storage/abort_multipart_upload.rb b/lib/fog/aws/requests/storage/abort_multipart_upload.rb index ecd35a477..4191e3fdc 100644 --- a/lib/fog/aws/requests/storage/abort_multipart_upload.rb +++ b/lib/fog/aws/requests/storage/abort_multipart_upload.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # # Abort a multipart upload @@ -41,5 +41,5 @@ module Fog end end # Mock end # Storage - end # Aws + end # AWS end # Fog diff --git a/lib/fog/aws/requests/storage/acl_utils.rb b/lib/fog/aws/requests/storage/acl_utils.rb index ecf47e931..61902f999 100644 --- a/lib/fog/aws/requests/storage/acl_utils.rb +++ b/lib/fog/aws/requests/storage/acl_utils.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS require 'fog/aws/parsers/storage/access_control_list' private diff --git a/lib/fog/aws/requests/storage/complete_multipart_upload.rb b/lib/fog/aws/requests/storage/complete_multipart_upload.rb index 46094e16a..c5580cc8e 100644 --- a/lib/fog/aws/requests/storage/complete_multipart_upload.rb +++ b/lib/fog/aws/requests/storage/complete_multipart_upload.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/complete_multipart_upload' @@ -69,5 +69,5 @@ module Fog end end # Mock end # Storage - end # Aws + end # AWS end # Fog diff --git a/lib/fog/aws/requests/storage/copy_object.rb b/lib/fog/aws/requests/storage/copy_object.rb index ca5d13f7d..4ac712e95 100644 --- a/lib/fog/aws/requests/storage/copy_object.rb +++ b/lib/fog/aws/requests/storage/copy_object.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/copy_object' diff --git a/lib/fog/aws/requests/storage/cors_utils.rb b/lib/fog/aws/requests/storage/cors_utils.rb index 6caafba12..0e4b3e59b 100644 --- a/lib/fog/aws/requests/storage/cors_utils.rb +++ b/lib/fog/aws/requests/storage/cors_utils.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS require 'fog/aws/parsers/storage/cors_configuration' private diff --git a/lib/fog/aws/requests/storage/delete_bucket.rb b/lib/fog/aws/requests/storage/delete_bucket.rb index 4a5d1b9ec..2d5331038 100644 --- a/lib/fog/aws/requests/storage/delete_bucket.rb +++ b/lib/fog/aws/requests/storage/delete_bucket.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Delete an S3 bucket # diff --git a/lib/fog/aws/requests/storage/delete_bucket_cors.rb b/lib/fog/aws/requests/storage/delete_bucket_cors.rb index a75e1e237..27900a6ac 100644 --- a/lib/fog/aws/requests/storage/delete_bucket_cors.rb +++ b/lib/fog/aws/requests/storage/delete_bucket_cors.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Deletes the cors configuration information set for the bucket. # diff --git a/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb index 153254591..3574fbbdd 100644 --- a/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb +++ b/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Delete lifecycle configuration for a bucket # diff --git a/lib/fog/aws/requests/storage/delete_bucket_policy.rb b/lib/fog/aws/requests/storage/delete_bucket_policy.rb index 7f2155011..22cba099f 100644 --- a/lib/fog/aws/requests/storage/delete_bucket_policy.rb +++ b/lib/fog/aws/requests/storage/delete_bucket_policy.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Delete policy for a bucket # diff --git a/lib/fog/aws/requests/storage/delete_bucket_tagging.rb b/lib/fog/aws/requests/storage/delete_bucket_tagging.rb index 07bf6c8be..8c3af34ec 100644 --- a/lib/fog/aws/requests/storage/delete_bucket_tagging.rb +++ b/lib/fog/aws/requests/storage/delete_bucket_tagging.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Delete tagging for a bucket # diff --git a/lib/fog/aws/requests/storage/delete_bucket_website.rb b/lib/fog/aws/requests/storage/delete_bucket_website.rb index 6b6c998f9..d6e80d802 100644 --- a/lib/fog/aws/requests/storage/delete_bucket_website.rb +++ b/lib/fog/aws/requests/storage/delete_bucket_website.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Delete website configuration for a bucket # diff --git a/lib/fog/aws/requests/storage/delete_multiple_objects.rb b/lib/fog/aws/requests/storage/delete_multiple_objects.rb index 1363b8bfe..229cc7cbd 100644 --- a/lib/fog/aws/requests/storage/delete_multiple_objects.rb +++ b/lib/fog/aws/requests/storage/delete_multiple_objects.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/delete_multiple_objects' diff --git a/lib/fog/aws/requests/storage/delete_object.rb b/lib/fog/aws/requests/storage/delete_object.rb index f482d1abe..b56adcab7 100644 --- a/lib/fog/aws/requests/storage/delete_object.rb +++ b/lib/fog/aws/requests/storage/delete_object.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Delete an object from S3 # diff --git a/lib/fog/aws/requests/storage/get_bucket.rb b/lib/fog/aws/requests/storage/get_bucket.rb index 2408fed8f..266e428ee 100644 --- a/lib/fog/aws/requests/storage/get_bucket.rb +++ b/lib/fog/aws/requests/storage/get_bucket.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/get_bucket' diff --git a/lib/fog/aws/requests/storage/get_bucket_acl.rb b/lib/fog/aws/requests/storage/get_bucket_acl.rb index 3530e84fa..5b5560d5d 100644 --- a/lib/fog/aws/requests/storage/get_bucket_acl.rb +++ b/lib/fog/aws/requests/storage/get_bucket_acl.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/access_control_list' diff --git a/lib/fog/aws/requests/storage/get_bucket_cors.rb b/lib/fog/aws/requests/storage/get_bucket_cors.rb index 82212137f..21e42f1ae 100644 --- a/lib/fog/aws/requests/storage/get_bucket_cors.rb +++ b/lib/fog/aws/requests/storage/get_bucket_cors.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/cors_configuration' diff --git a/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb index 182c0e06e..21983ec29 100644 --- a/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb +++ b/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/get_bucket_lifecycle' diff --git a/lib/fog/aws/requests/storage/get_bucket_location.rb b/lib/fog/aws/requests/storage/get_bucket_location.rb index 382dbe76d..78c44fc5e 100644 --- a/lib/fog/aws/requests/storage/get_bucket_location.rb +++ b/lib/fog/aws/requests/storage/get_bucket_location.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/get_bucket_location' diff --git a/lib/fog/aws/requests/storage/get_bucket_logging.rb b/lib/fog/aws/requests/storage/get_bucket_logging.rb index d16ef15b7..87c8d5ec2 100644 --- a/lib/fog/aws/requests/storage/get_bucket_logging.rb +++ b/lib/fog/aws/requests/storage/get_bucket_logging.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/get_bucket_logging' diff --git a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb index 13a4d5786..11ba690cf 100644 --- a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb +++ b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/get_bucket_object_versions' diff --git a/lib/fog/aws/requests/storage/get_bucket_policy.rb b/lib/fog/aws/requests/storage/get_bucket_policy.rb index 6d9689f6d..8a1c793c6 100644 --- a/lib/fog/aws/requests/storage/get_bucket_policy.rb +++ b/lib/fog/aws/requests/storage/get_bucket_policy.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Get bucket policy for an S3 bucket # diff --git a/lib/fog/aws/requests/storage/get_bucket_tagging.rb b/lib/fog/aws/requests/storage/get_bucket_tagging.rb index 20a8d70d2..a5f979418 100644 --- a/lib/fog/aws/requests/storage/get_bucket_tagging.rb +++ b/lib/fog/aws/requests/storage/get_bucket_tagging.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/get_bucket_tagging' diff --git a/lib/fog/aws/requests/storage/get_bucket_versioning.rb b/lib/fog/aws/requests/storage/get_bucket_versioning.rb index 722413193..b3e91dc14 100644 --- a/lib/fog/aws/requests/storage/get_bucket_versioning.rb +++ b/lib/fog/aws/requests/storage/get_bucket_versioning.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/get_bucket_versioning' diff --git a/lib/fog/aws/requests/storage/get_bucket_website.rb b/lib/fog/aws/requests/storage/get_bucket_website.rb index 26b917b84..a64ff658f 100644 --- a/lib/fog/aws/requests/storage/get_bucket_website.rb +++ b/lib/fog/aws/requests/storage/get_bucket_website.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/get_bucket_website' diff --git a/lib/fog/aws/requests/storage/get_object.rb b/lib/fog/aws/requests/storage/get_object.rb index 60c5ab8b4..4aee509bc 100644 --- a/lib/fog/aws/requests/storage/get_object.rb +++ b/lib/fog/aws/requests/storage/get_object.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Get an object from S3 # @@ -103,7 +103,7 @@ module Fog body = object[:body] if options['Range'] - # since Aws S3 itself does not support multiple range headers, we will use only the first + # since AWS S3 itself does not support multiple range headers, we will use only the first ranges = byte_ranges(options['Range'], body.size) unless ranges.nil? || ranges.empty? response.status = 206 diff --git a/lib/fog/aws/requests/storage/get_object_acl.rb b/lib/fog/aws/requests/storage/get_object_acl.rb index 0f0be4edc..f074e6c19 100644 --- a/lib/fog/aws/requests/storage/get_object_acl.rb +++ b/lib/fog/aws/requests/storage/get_object_acl.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/access_control_list' diff --git a/lib/fog/aws/requests/storage/get_object_http_url.rb b/lib/fog/aws/requests/storage/get_object_http_url.rb index f63745083..1b5480a03 100644 --- a/lib/fog/aws/requests/storage/get_object_http_url.rb +++ b/lib/fog/aws/requests/storage/get_object_http_url.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS module GetObjectHttpUrl def get_object_http_url(bucket_name, object_name, expires, options = {}) get_object_url(bucket_name, object_name, expires, options.merge(:scheme => 'http')) diff --git a/lib/fog/aws/requests/storage/get_object_https_url.rb b/lib/fog/aws/requests/storage/get_object_https_url.rb index 4137d82e6..5b8411ed6 100644 --- a/lib/fog/aws/requests/storage/get_object_https_url.rb +++ b/lib/fog/aws/requests/storage/get_object_https_url.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS module GetObjectHttpsUrl def get_object_https_url(bucket_name, object_name, expires, options = {}) get_object_url(bucket_name, object_name, expires, options.merge(:scheme => 'https')) diff --git a/lib/fog/aws/requests/storage/get_object_torrent.rb b/lib/fog/aws/requests/storage/get_object_torrent.rb index 9677bf726..2ebab2d4a 100644 --- a/lib/fog/aws/requests/storage/get_object_torrent.rb +++ b/lib/fog/aws/requests/storage/get_object_torrent.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Get torrent for an S3 object # diff --git a/lib/fog/aws/requests/storage/get_object_url.rb b/lib/fog/aws/requests/storage/get_object_url.rb index a0e324f52..fc304e103 100644 --- a/lib/fog/aws/requests/storage/get_object_url.rb +++ b/lib/fog/aws/requests/storage/get_object_url.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS module GetObjectUrl def get_object_url(bucket_name, object_name, expires, options = {}) unless bucket_name diff --git a/lib/fog/aws/requests/storage/get_request_payment.rb b/lib/fog/aws/requests/storage/get_request_payment.rb index 439286167..c12baef62 100644 --- a/lib/fog/aws/requests/storage/get_request_payment.rb +++ b/lib/fog/aws/requests/storage/get_request_payment.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/get_request_payment' diff --git a/lib/fog/aws/requests/storage/get_service.rb b/lib/fog/aws/requests/storage/get_service.rb index 93d4d342b..497f54d1b 100644 --- a/lib/fog/aws/requests/storage/get_service.rb +++ b/lib/fog/aws/requests/storage/get_service.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/get_service' diff --git a/lib/fog/aws/requests/storage/head_bucket.rb b/lib/fog/aws/requests/storage/head_bucket.rb index 57768bf0d..7ef4fb634 100644 --- a/lib/fog/aws/requests/storage/head_bucket.rb +++ b/lib/fog/aws/requests/storage/head_bucket.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Get headers for an S3 bucket, used to verify if it exists and if you have permission to access it # diff --git a/lib/fog/aws/requests/storage/head_object.rb b/lib/fog/aws/requests/storage/head_object.rb index 63fff920b..9d2d1e33b 100644 --- a/lib/fog/aws/requests/storage/head_object.rb +++ b/lib/fog/aws/requests/storage/head_object.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Get headers for an object from S3 # diff --git a/lib/fog/aws/requests/storage/initiate_multipart_upload.rb b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb index c0d044597..95e89125c 100644 --- a/lib/fog/aws/requests/storage/initiate_multipart_upload.rb +++ b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/initiate_multipart_upload' @@ -62,5 +62,5 @@ module Fog end end # Mock end # Storage - end # Aws + end # AWS end # Fog diff --git a/lib/fog/aws/requests/storage/list_multipart_uploads.rb b/lib/fog/aws/requests/storage/list_multipart_uploads.rb index bb8b3dcd4..eb45c0e01 100644 --- a/lib/fog/aws/requests/storage/list_multipart_uploads.rb +++ b/lib/fog/aws/requests/storage/list_multipart_uploads.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/list_multipart_uploads' diff --git a/lib/fog/aws/requests/storage/list_parts.rb b/lib/fog/aws/requests/storage/list_parts.rb index 9387c8ee6..4344870da 100644 --- a/lib/fog/aws/requests/storage/list_parts.rb +++ b/lib/fog/aws/requests/storage/list_parts.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/parsers/storage/list_parts' diff --git a/lib/fog/aws/requests/storage/post_object_hidden_fields.rb b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb index 4ce7e3a6c..4158ad73f 100644 --- a/lib/fog/aws/requests/storage/post_object_hidden_fields.rb +++ b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Get a hash of hidden fields for form uploading to S3, in the form {:field_name => :field_value} # Form should look like:
diff --git a/lib/fog/aws/requests/storage/post_object_restore.rb b/lib/fog/aws/requests/storage/post_object_restore.rb index 917a4fffd..039c57b41 100644 --- a/lib/fog/aws/requests/storage/post_object_restore.rb +++ b/lib/fog/aws/requests/storage/post_object_restore.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Restore an object from Glacier to its original S3 path # diff --git a/lib/fog/aws/requests/storage/put_bucket.rb b/lib/fog/aws/requests/storage/put_bucket.rb index 3248d5db1..c07a4bba3 100644 --- a/lib/fog/aws/requests/storage/put_bucket.rb +++ b/lib/fog/aws/requests/storage/put_bucket.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Create an S3 bucket # diff --git a/lib/fog/aws/requests/storage/put_bucket_acl.rb b/lib/fog/aws/requests/storage/put_bucket_acl.rb index b22c36604..d8abcbf23 100644 --- a/lib/fog/aws/requests/storage/put_bucket_acl.rb +++ b/lib/fog/aws/requests/storage/put_bucket_acl.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/requests/storage/acl_utils' diff --git a/lib/fog/aws/requests/storage/put_bucket_cors.rb b/lib/fog/aws/requests/storage/put_bucket_cors.rb index a9590ec0c..0b645fc30 100644 --- a/lib/fog/aws/requests/storage/put_bucket_cors.rb +++ b/lib/fog/aws/requests/storage/put_bucket_cors.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/requests/storage/cors_utils' diff --git a/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb index 5d3f1a972..fbc1184d1 100644 --- a/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb +++ b/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Change lifecycle configuration for an S3 bucket # diff --git a/lib/fog/aws/requests/storage/put_bucket_logging.rb b/lib/fog/aws/requests/storage/put_bucket_logging.rb index eeb9aaedc..50a387b48 100644 --- a/lib/fog/aws/requests/storage/put_bucket_logging.rb +++ b/lib/fog/aws/requests/storage/put_bucket_logging.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Change logging status for an S3 bucket # diff --git a/lib/fog/aws/requests/storage/put_bucket_policy.rb b/lib/fog/aws/requests/storage/put_bucket_policy.rb index aa7155ad7..75aad7f94 100644 --- a/lib/fog/aws/requests/storage/put_bucket_policy.rb +++ b/lib/fog/aws/requests/storage/put_bucket_policy.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Change bucket policy for an S3 bucket # diff --git a/lib/fog/aws/requests/storage/put_bucket_tagging.rb b/lib/fog/aws/requests/storage/put_bucket_tagging.rb index 988d4f02a..cce053c04 100644 --- a/lib/fog/aws/requests/storage/put_bucket_tagging.rb +++ b/lib/fog/aws/requests/storage/put_bucket_tagging.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Change tag set for an S3 bucket # diff --git a/lib/fog/aws/requests/storage/put_bucket_versioning.rb b/lib/fog/aws/requests/storage/put_bucket_versioning.rb index b7e4c33ba..deb1f1188 100644 --- a/lib/fog/aws/requests/storage/put_bucket_versioning.rb +++ b/lib/fog/aws/requests/storage/put_bucket_versioning.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Change versioning status for an S3 bucket # diff --git a/lib/fog/aws/requests/storage/put_bucket_website.rb b/lib/fog/aws/requests/storage/put_bucket_website.rb index 65c378818..4feebe6b7 100644 --- a/lib/fog/aws/requests/storage/put_bucket_website.rb +++ b/lib/fog/aws/requests/storage/put_bucket_website.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Change website configuration for an S3 bucket # diff --git a/lib/fog/aws/requests/storage/put_object.rb b/lib/fog/aws/requests/storage/put_object.rb index d89dd80e3..42e3e0c77 100644 --- a/lib/fog/aws/requests/storage/put_object.rb +++ b/lib/fog/aws/requests/storage/put_object.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Create an object in an S3 bucket # diff --git a/lib/fog/aws/requests/storage/put_object_acl.rb b/lib/fog/aws/requests/storage/put_object_acl.rb index 433c9c58e..e2b666351 100644 --- a/lib/fog/aws/requests/storage/put_object_acl.rb +++ b/lib/fog/aws/requests/storage/put_object_acl.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real require 'fog/aws/requests/storage/acl_utils' diff --git a/lib/fog/aws/requests/storage/put_object_url.rb b/lib/fog/aws/requests/storage/put_object_url.rb index 016e6a946..b0ea262c2 100644 --- a/lib/fog/aws/requests/storage/put_object_url.rb +++ b/lib/fog/aws/requests/storage/put_object_url.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS module PutObjectUrl def put_object_url(bucket_name, object_name, expires, headers = {}, options = {}) unless bucket_name diff --git a/lib/fog/aws/requests/storage/put_request_payment.rb b/lib/fog/aws/requests/storage/put_request_payment.rb index 1c6f52acb..5126808e2 100644 --- a/lib/fog/aws/requests/storage/put_request_payment.rb +++ b/lib/fog/aws/requests/storage/put_request_payment.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Change who pays for requests to an S3 bucket # diff --git a/lib/fog/aws/requests/storage/shared_mock_methods.rb b/lib/fog/aws/requests/storage/shared_mock_methods.rb index 6c4d41939..0005f02b2 100644 --- a/lib/fog/aws/requests/storage/shared_mock_methods.rb +++ b/lib/fog/aws/requests/storage/shared_mock_methods.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS module SharedMockMethods def define_mock_acl(bucket_name, object_name, options) acl = options['x-amz-acl'] || 'private' diff --git a/lib/fog/aws/requests/storage/sync_clock.rb b/lib/fog/aws/requests/storage/sync_clock.rb index 657c98775..669041288 100644 --- a/lib/fog/aws/requests/storage/sync_clock.rb +++ b/lib/fog/aws/requests/storage/sync_clock.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Sync clock against S3 to avoid skew errors # @@ -20,5 +20,5 @@ module Fog end end # Mock end # Storage - end # Aws + end # AWS end # Fog diff --git a/lib/fog/aws/requests/storage/upload_part.rb b/lib/fog/aws/requests/storage/upload_part.rb index 297842491..ed9f33074 100644 --- a/lib/fog/aws/requests/storage/upload_part.rb +++ b/lib/fog/aws/requests/storage/upload_part.rb @@ -1,6 +1,6 @@ module Fog module Storage - class Aws + class AWS class Real # Upload a part for a multipart upload # @@ -53,5 +53,5 @@ module Fog end end # Mock end # Storage - end # Aws + end # AWS end # Fog diff --git a/lib/fog/aws/requests/sts/assume_role.rb b/lib/fog/aws/requests/sts/assume_role.rb index 7a9bca4d4..8735751ff 100644 --- a/lib/fog/aws/requests/sts/assume_role.rb +++ b/lib/fog/aws/requests/sts/assume_role.rb @@ -17,9 +17,9 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: # * 'Arn'<~String>: The ARN of the assumed role/user - # * 'AccessKeyId'<~String>: The Aws access key of the temporary credentials for the assumed role - # * 'SecretAccessKey'<~String>: The Aws secret key of the temporary credentials for the assumed role - # * 'SessionToken'<~String>: The Aws session token of the temporary credentials for the assumed role + # * 'AccessKeyId'<~String>: The AWS access key of the temporary credentials for the assumed role + # * 'SecretAccessKey'<~String>: The AWS secret key of the temporary credentials for the assumed role + # * 'SessionToken'<~String>: The AWS session token of the temporary credentials for the assumed role # * 'Expiration'<~Time>: The expiration time of the temporary credentials for the assumed role # # ==== See Also diff --git a/lib/fog/aws/requests/sts/assume_role_with_saml.rb b/lib/fog/aws/requests/sts/assume_role_with_saml.rb index daa9583c4..9d0665ee6 100644 --- a/lib/fog/aws/requests/sts/assume_role_with_saml.rb +++ b/lib/fog/aws/requests/sts/assume_role_with_saml.rb @@ -17,9 +17,9 @@ module Fog # * response<~Excon::Response>: # * body<~Hash>: # * 'Arn'<~String>: The ARN of the assumed role/user - # * 'AccessKeyId'<~String>: The Aws access key of the temporary credentials for the assumed role - # * 'SecretAccessKey'<~String>: The Aws secret key of the temporary credentials for the assumed role - # * 'SessionToken'<~String>: The Aws session token of the temporary credentials for the assumed role + # * 'AccessKeyId'<~String>: The AWS access key of the temporary credentials for the assumed role + # * 'SecretAccessKey'<~String>: The AWS secret key of the temporary credentials for the assumed role + # * 'SessionToken'<~String>: The AWS session token of the temporary credentials for the assumed role # * 'Expiration'<~Time>: The expiration time of the temporary credentials for the assumed role # # ==== See Also diff --git a/lib/fog/aws/ses.rb b/lib/fog/aws/ses.rb index 3c8864d72..7fd34f27f 100644 --- a/lib/fog/aws/ses.rb +++ b/lib/fog/aws/ses.rb @@ -46,7 +46,7 @@ module Fog # * region<~String> - optional region to use. For instance, 'us-east-1' and etc. # # ==== Returns - # * SES object with connection to Aws. + # * SES object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] @@ -90,9 +90,9 @@ module Fog 'Date' => Fog::Time.now.to_date_header, } headers['x-amz-security-token'] = @aws_session_token if @aws_session_token - #Aws3-HTTPS AwsAccessKeyId=, Algorithm=HmacSHA256, Signature= - headers['X-Amzn-Authorization'] = 'Aws3-HTTPS ' - headers['X-Amzn-Authorization'] << 'AwsAccessKeyId=' << @aws_access_key_id + #AWS3-HTTPS AWSAccessKeyId=, Algorithm=HmacSHA256, Signature= + headers['X-Amzn-Authorization'] = 'AWS3-HTTPS ' + headers['X-Amzn-Authorization'] << 'AWSAccessKeyId=' << @aws_access_key_id headers['X-Amzn-Authorization'] << ', Algorithm=HmacSHA256' headers['X-Amzn-Authorization'] << ', Signature=' << Base64.encode64(@hmac.sign(headers['Date'])).chomp! diff --git a/lib/fog/aws/signaturev4.rb b/lib/fog/aws/signaturev4.rb index 3ae483d13..054b1220f 100644 --- a/lib/fog/aws/signaturev4.rb +++ b/lib/fog/aws/signaturev4.rb @@ -4,12 +4,12 @@ require 'fog/aws/core' module Fog module AWS class SignatureV4 - ALGORITHM = 'Aws4-HMAC-SHA256' + ALGORITHM = 'AWS4-HMAC-SHA256' def initialize(aws_access_key_id, secret_key, region, service) @region = region @service = service @aws_access_key_id = aws_access_key_id - @hmac = Fog::HMAC.new('sha256', 'Aws4' + secret_key) + @hmac = Fog::HMAC.new('sha256', 'AWS4' + secret_key) end def signature_parameters(params, date, body_sha = nil) diff --git a/lib/fog/aws/sns.rb b/lib/fog/aws/sns.rb index faa830bae..c400ee5d9 100644 --- a/lib/fog/aws/sns.rb +++ b/lib/fog/aws/sns.rb @@ -39,8 +39,6 @@ module Fog end end - attr_reader :region - def initialize(options={}) @region = options[:region] || 'us-east-1' @aws_access_key_id = options[:aws_access_key_id] @@ -79,7 +77,7 @@ module Fog # * options<~Hash> - config arguments for connection. Defaults to {}. # # ==== Returns - # * SNS object with connection to Aws. + # * SNS object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] @connection_options = options[:connection_options] || {} @@ -99,8 +97,6 @@ module Fog setup_credentials(options) end - attr_reader :region - def reload @connection.reset end @@ -122,7 +118,7 @@ module Fog idempotent = params.delete(:idempotent) parser = params.delete(:parser) - body, headers = Aws.signed_params_v4( + body, headers = AWS.signed_params_v4( params, { 'Content-Type' => 'application/x-www-form-urlencoded' }, { diff --git a/lib/fog/aws/sqs.rb b/lib/fog/aws/sqs.rb index 97c8a1370..508f2118b 100644 --- a/lib/fog/aws/sqs.rb +++ b/lib/fog/aws/sqs.rb @@ -77,7 +77,7 @@ module Fog # * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc. # # ==== Returns - # * SQS object with connection to Aws. + # * SQS object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] @instrumentor = options[:instrumentor] @@ -122,7 +122,7 @@ module Fog parser = params.delete(:parser) path = params.delete(:path) - body, headers = Aws.signed_params_v4( + body, headers = AWS.signed_params_v4( params, { 'Content-Type' => 'application/x-www-form-urlencoded' }, { diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb index 7d8fd1e67..e68eeb2d7 100644 --- a/lib/fog/aws/storage.rb +++ b/lib/fog/aws/storage.rb @@ -2,7 +2,7 @@ require 'fog/aws/core' module Fog module Storage - class Aws < Fog::Service + class AWS < Fog::Service extend Fog::AWS::CredentialFetcher::ServiceMethods COMPLIANT_BUCKET_NAMES = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/ @@ -139,7 +139,7 @@ module Fog def signed_url(params, expires) #convert expires from a point in time to a delta to now - now = Fog::Time.now + now = Fog::Time.now expires = expires.to_i - now.to_i params[:headers] ||= {} @@ -224,10 +224,10 @@ module Fog if COMPLIANT_BUCKET_NAMES !~ bucket_name Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance. For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html") path_style = true - elsif scheme == 'https' && bucket_name =~ /\./ + elsif scheme == 'https' && !path_style && bucket_name =~ /\./ Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) contains a '.' so is not accessible over https as a virtual hosted bucket, which will negatively impact performance. For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html") path_style = true - end + end end if path_style @@ -406,7 +406,7 @@ module Fog # # ==== Examples # s3 = Fog::Storage.new( - # :provider => "Aws", + # :provider => "AWS", # :aws_access_key_id => your_aws_access_key_id, # :aws_secret_access_key => your_aws_secret_access_key # ) @@ -494,7 +494,7 @@ module Fog if @signature_version == 2 expires = date.to_date_header params[:headers]['Date'] = expires - params[:headers]['Authorization'] = "Aws #{@aws_access_key_id}:#{signature_v2(params, expires)}" + params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature_v2(params, expires)}" end params = request_params(params) @@ -508,7 +508,7 @@ module Fog params[:headers]['x-amz-date'] = date.to_iso8601_basic if params[:body].respond_to?(:read) # See http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-streaming.html - params[:headers]['x-amz-content-sha256'] = 'STREAMING-Aws4-HMAC-SHA256-PAYLOAD' + params[:headers]['x-amz-content-sha256'] = 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD' params[:headers]['x-amz-decoded-content-length'] = params[:headers].delete 'Content-Length' encoding = "aws-chunked" @@ -520,7 +520,7 @@ module Fog end signature_components = @signer.signature_components(params, date, params[:headers]['x-amz-content-sha256']) params[:headers]['Authorization'] = @signer.components_to_header(signature_components) - + if params[:body].respond_to?(:read) body = params.delete :body params[:request_block] = S3Streamer.new(body, signature_components['X-Amz-Signature'], @signer, date) @@ -580,7 +580,7 @@ module Fog if body.respond_to?(:binmode) body.binmode end - + if body.respond_to?(:pos=) body.pos = 0 end @@ -615,7 +615,7 @@ module Fog def sign_chunk(data, previous_signature) string_to_sign = <<-DATA -Aws4-HMAC-SHA256-PAYLOAD +AWS4-HMAC-SHA256-PAYLOAD #{date.to_iso8601_basic} #{signer.credential_scope(date)} #{previous_signature} diff --git a/lib/fog/aws/sts.rb b/lib/fog/aws/sts.rb index c51cb9c08..8391c67bb 100644 --- a/lib/fog/aws/sts.rb +++ b/lib/fog/aws/sts.rb @@ -71,7 +71,7 @@ module Fog # * options<~Hash> - config arguments for connection. Defaults to {}. # # ==== Returns - # * STS object with connection to Aws. + # * STS object with connection to AWS. def initialize(options={}) @use_iam_profile = options[:use_iam_profile] diff --git a/tests/credentials_tests.rb b/tests/credentials_tests.rb index d6d7ea442..54e08690b 100644 --- a/tests/credentials_tests.rb +++ b/tests/credentials_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws | credentials', ['aws']) do +Shindo.tests('AWS | credentials', ['aws']) do old_mock_value = Excon.defaults[:mock] Excon.stubs.clear diff --git a/tests/lorem.txt b/tests/lorem.txt new file mode 100644 index 000000000..e8b7adfc7 --- /dev/null +++ b/tests/lorem.txt @@ -0,0 +1 @@ +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. \ No newline at end of file diff --git a/tests/models/auto_scaling/activities_tests.rb b/tests/models/auto_scaling/activities_tests.rb index a4b67831a..449047d1d 100644 --- a/tests/models/auto_scaling/activities_tests.rb +++ b/tests/models/auto_scaling/activities_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::AutoScaling | activities', ['aws', 'auto_scaling_m']) do +Shindo.tests('AWS::AutoScaling | activities', ['aws', 'auto_scaling_m']) do pending # FIXME: activity#save is not implemented collection_tests(Fog::AWS[:auto_scaling].activities, {}, false) diff --git a/tests/models/auto_scaling/configuration_test.rb b/tests/models/auto_scaling/configuration_test.rb index 3e0fbc6c4..d0d77508f 100644 --- a/tests/models/auto_scaling/configuration_test.rb +++ b/tests/models/auto_scaling/configuration_test.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::AutoScaling | configuration', ['aws', 'auto_scaling_m']) do +Shindo.tests('AWS::AutoScaling | configuration', ['aws', 'auto_scaling_m']) do params = { :id => uniq_id, diff --git a/tests/models/auto_scaling/configurations_tests.rb b/tests/models/auto_scaling/configurations_tests.rb index 476615986..1dae9f392 100644 --- a/tests/models/auto_scaling/configurations_tests.rb +++ b/tests/models/auto_scaling/configurations_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::AutoScaling | configurations', ['aws', 'auto_scaling_m']) do +Shindo.tests('AWS::AutoScaling | configurations', ['aws', 'auto_scaling_m']) do params = { :id => uniq_id, diff --git a/tests/models/auto_scaling/groups_test.rb b/tests/models/auto_scaling/groups_test.rb index 7cd8f222d..6cec9e7b6 100644 --- a/tests/models/auto_scaling/groups_test.rb +++ b/tests/models/auto_scaling/groups_test.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::AutoScaling | group', ['aws', 'auto_scaling_m']) do +Shindo.tests('AWS::AutoScaling | group', ['aws', 'auto_scaling_m']) do params = { :id => uniq_id, diff --git a/tests/models/auto_scaling/instances_tests.rb b/tests/models/auto_scaling/instances_tests.rb index 3b5232ce1..afaaa41b3 100644 --- a/tests/models/auto_scaling/instances_tests.rb +++ b/tests/models/auto_scaling/instances_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::AutoScaling | instances', ['aws', 'auto_scaling_m']) do +Shindo.tests('AWS::AutoScaling | instances', ['aws', 'auto_scaling_m']) do pending # FIXME: instance#save is not defined #collection_tests(Fog::AWS[:auto_scaling].instances, {}, false) diff --git a/tests/models/beanstalk/version_tests.rb b/tests/models/beanstalk/version_tests.rb index 2758eafa5..12662e049 100644 --- a/tests/models/beanstalk/version_tests.rb +++ b/tests/models/beanstalk/version_tests.rb @@ -37,7 +37,7 @@ Shindo.tests("Fog::AWS[:beanstalk] | version", ['aws', 'beanstalk']) do passed = false if @instance.description == new_description - # reload version from Aws to verify save is committed to server, not just on local object + # reload version from AWS to verify save is committed to server, not just on local object if @beanstalk.versions.get(@application_name, @version_name).description == new_description passed = true end @@ -51,7 +51,7 @@ Shindo.tests("Fog::AWS[:beanstalk] | version", ['aws', 'beanstalk']) do passed = false if @instance.description == nil - # reload version from Aws to verify save is committed to server, not just on local object + # reload version from AWS to verify save is committed to server, not just on local object if @beanstalk.versions.get(@application_name, @version_name).description == nil passed = true end diff --git a/tests/models/cloud_watch/alarm_data_tests.rb b/tests/models/cloud_watch/alarm_data_tests.rb index 06b0103d7..d00dde8b6 100644 --- a/tests/models/cloud_watch/alarm_data_tests.rb +++ b/tests/models/cloud_watch/alarm_data_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::CloudWatch | alarm_data", ['aws', 'cloudwatch']) do +Shindo.tests("AWS::CloudWatch | alarm_data", ['aws', 'cloudwatch']) do pending if Fog.mocking? @@ -12,7 +12,7 @@ Shindo.tests("Aws::CloudWatch | alarm_data", ['aws', 'cloudwatch']) do Fog::AWS[:cloud_watch].alarm_data.all(alarm_name_prefix) end - namespace = 'Aws/EC2' + namespace = 'AWS/EC2' metric_name = 'CPUUtilization' tests("#get").succeeds do diff --git a/tests/models/cloud_watch/alarm_history_tests.rb b/tests/models/cloud_watch/alarm_history_tests.rb index c881c9aa8..07db10aeb 100644 --- a/tests/models/cloud_watch/alarm_history_tests.rb +++ b/tests/models/cloud_watch/alarm_history_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::CloudWatch | alarm_histories", ['aws', 'cloudwatch']) do +Shindo.tests("AWS::CloudWatch | alarm_histories", ['aws', 'cloudwatch']) do pending if Fog.mocking? diff --git a/tests/models/cloud_watch/metric_statistics_tests.rb b/tests/models/cloud_watch/metric_statistics_tests.rb index 44e6e9552..e84b24c44 100644 --- a/tests/models/cloud_watch/metric_statistics_tests.rb +++ b/tests/models/cloud_watch/metric_statistics_tests.rb @@ -1,11 +1,11 @@ -Shindo.tests("Aws::CloudWatch | metric_statistics", ['aws', 'cloudwatch']) do +Shindo.tests("AWS::CloudWatch | metric_statistics", ['aws', 'cloudwatch']) do tests('success') do pending if Fog.mocking? instanceId = 'i-420c352f' metricName = 'DiskReadBytes' - namespace = 'Aws/EC2' + namespace = 'AWS/EC2' startTime = (Time.now-600).iso8601 endTime = Time.now.iso8601 period = 60 diff --git a/tests/models/cloud_watch/metrics_tests.rb b/tests/models/cloud_watch/metrics_tests.rb index 61165f4e0..4fc7b1e68 100644 --- a/tests/models/cloud_watch/metrics_tests.rb +++ b/tests/models/cloud_watch/metrics_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::CloudWatch | metrics", ['aws', 'cloudwatch']) do +Shindo.tests("AWS::CloudWatch | metrics", ['aws', 'cloudwatch']) do tests('success') do pending # FIXME: the hardcoded instance id won't be available @@ -7,7 +7,7 @@ Shindo.tests("Aws::CloudWatch | metrics", ['aws', 'cloudwatch']) do end instanceId = 'i-fd713391' metricName = 'CPUUtilization' - namespace = 'Aws/EC2' + namespace = 'AWS/EC2' tests("#get").returns({:dimensions=>[{"Name"=>"InstanceId", "Value"=>instanceId}], :name=>metricName, :namespace=>namespace}) do Fog::AWS[:cloud_watch].metrics.get(namespace, metricName, {'InstanceId' => instanceId}).attributes end diff --git a/tests/models/data_pipeline/pipeline_tests.rb b/tests/models/data_pipeline/pipeline_tests.rb index 322b19bd6..cdc96a58d 100644 --- a/tests/models/data_pipeline/pipeline_tests.rb +++ b/tests/models/data_pipeline/pipeline_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::DataPipeline | pipelines", ['aws', 'data_pipeline']) do +Shindo.tests("AWS::DataPipeline | pipelines", ['aws', 'data_pipeline']) do pending if Fog.mocking? unique_id = uniq_id diff --git a/tests/models/data_pipeline/pipelines_tests.rb b/tests/models/data_pipeline/pipelines_tests.rb index b16bf9e90..f4c375784 100644 --- a/tests/models/data_pipeline/pipelines_tests.rb +++ b/tests/models/data_pipeline/pipelines_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::DataPipeline | pipelines", ['aws', 'data_pipeline']) do +Shindo.tests("AWS::DataPipeline | pipelines", ['aws', 'data_pipeline']) do pending if Fog.mocking? unique_id = uniq_id diff --git a/tests/models/elasticache/cluster_tests.rb b/tests/models/elasticache/cluster_tests.rb index 07f920d1d..8c96eb9f9 100644 --- a/tests/models/elasticache/cluster_tests.rb +++ b/tests/models/elasticache/cluster_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Elasticache | cache clusters', ['aws', 'elasticache']) do +Shindo.tests('AWS::Elasticache | cache clusters', ['aws', 'elasticache']) do cluster_params = { :id => "fog-test-cluster-#{rand(999).to_s}", :node_type => 'cache.m1.large', @@ -10,8 +10,8 @@ Shindo.tests('Aws::Elasticache | cache clusters', ['aws', 'elasticache']) do pending if Fog.mocking? Formatador.display_line "Creating cluster #{cluster_params[:id]}..." - model_tests(Aws[:elasticache].clusters, cluster_params, false) do - @instance.reload # Reload to get the cluster info from Aws + model_tests(Fog::AWS[:elasticache].clusters, cluster_params, false) do + @instance.reload # Reload to get the cluster info from AWS Formatador.display_line "Waiting for #{@instance.id} "+ "to become available (#{@instance.status})..." @instance.wait_for {ready?} @@ -20,8 +20,8 @@ Shindo.tests('Aws::Elasticache | cache clusters', ['aws', 'elasticache']) do # Single model is still deleting, so re-randomize the cluster ID cluster_params[:id] = "fog-test-cluster-#{rand(999).to_s}" Formatador.display_line "Creating cluster #{cluster_params[:id]}..." - collection_tests(Aws[:elasticache].clusters, cluster_params, false) do - @instance.reload # Reload to get the cluster info from Aws + collection_tests(Fog::AWS[:elasticache].clusters, cluster_params, false) do + @instance.reload # Reload to get the cluster info from AWS Formatador.display_line "Waiting for #{@instance.id} "+ "to become available (#{@instance.status})..." @instance.wait_for {ready?} diff --git a/tests/models/elasticache/parameter_groups_tests.rb b/tests/models/elasticache/parameter_groups_tests.rb index aa1b78b63..c10c68f26 100644 --- a/tests/models/elasticache/parameter_groups_tests.rb +++ b/tests/models/elasticache/parameter_groups_tests.rb @@ -1,14 +1,14 @@ -Shindo.tests('Aws::Elasticache | parameter groups', ['aws', 'elasticache']) do +Shindo.tests('AWS::Elasticache | parameter groups', ['aws', 'elasticache']) do group_name = 'fog-test' description = 'Fog Test' model_tests( - Aws[:elasticache].parameter_groups, + Fog::AWS[:elasticache].parameter_groups, {:id => group_name, :description => description}, true ) collection_tests( - Aws[:elasticache].parameter_groups, + Fog::AWS[:elasticache].parameter_groups, {:id => group_name, :description => description}, true ) diff --git a/tests/models/elasticache/security_groups_tests.rb b/tests/models/elasticache/security_groups_tests.rb index 0b9531adf..fa28a5d28 100644 --- a/tests/models/elasticache/security_groups_tests.rb +++ b/tests/models/elasticache/security_groups_tests.rb @@ -1,16 +1,16 @@ -Shindo.tests('Aws::Elasticache | security groups', ['aws', 'elasticache']) do +Shindo.tests('AWS::Elasticache | security groups', ['aws', 'elasticache']) do group_name = 'fog-test' description = 'Fog Test' pending if Fog.mocking? model_tests( - Aws[:elasticache].security_groups, + Fog::AWS[:elasticache].security_groups, {:id => group_name, :description => description}, false ) do # An EC2 group to authorize - ec2_group = Fog::Compute.new(:provider => 'Aws').security_groups.create( + ec2_group = Fog::Compute.new(:provider => 'AWS').security_groups.create( :name => 'fog-test-elasticache', :description => 'fog test' ) @@ -45,7 +45,7 @@ Shindo.tests('Aws::Elasticache | security groups', ['aws', 'elasticache']) do end collection_tests( - Aws[:elasticache].security_groups, + Fog::AWS[:elasticache].security_groups, {:id => group_name, :description => description}, false ) diff --git a/tests/models/elasticache/subnet_groups_tests.rb b/tests/models/elasticache/subnet_groups_tests.rb index 2febf2e73..7575b69e0 100644 --- a/tests/models/elasticache/subnet_groups_tests.rb +++ b/tests/models/elasticache/subnet_groups_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Elasticache | subnet group', ['aws', 'elasticache']) do +Shindo.tests('AWS::Elasticache | subnet group', ['aws', 'elasticache']) do # random_differentiator # Useful when rapidly re-running tests, so we don't have to wait # serveral minutes for deleted VPCs/subnets to disappear @@ -27,12 +27,12 @@ Shindo.tests('Aws::Elasticache | subnet group', ['aws', 'elasticache']) do subnet_ids = @subnets.map { |sn| sn['subnetId'] }.to_a model_tests( - Aws[:elasticache].subnet_groups, + Fog::AWS[:elasticache].subnet_groups, {:name => group_name, :subnet_ids => subnet_ids, :description => description}, true ) collection_tests( - Aws[:elasticache].subnet_groups, + Fog::AWS[:elasticache].subnet_groups, {:name => group_name, :subnet_ids => subnet_ids, :description => description}, true ) end diff --git a/tests/models/elb/model_tests.rb b/tests/models/elb/model_tests.rb index 19881b7d8..c63058386 100644 --- a/tests/models/elb/model_tests.rb +++ b/tests/models/elb/model_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::ELB | models', ['aws', 'elb']) do +Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do Fog::Compute::AWS::Mock.reset if Fog.mocking? @availability_zones = Fog::Compute[:aws].describe_availability_zones('state' => 'available').body['availabilityZoneInfo'].map{ |az| az['zoneName'] } @key_name = 'fog-test-model' @@ -69,7 +69,7 @@ Shindo.tests('Aws::ELB | models', ['aws', 'elb']) do Fog::Compute[:aws].disable_ec2_classic if Fog.mocking? if Fog::Compute[:aws].supported_platforms.include?("EC2") - Formatador.display_line("[yellow]Skipping test [bold]with default vpc[/][yellow] due to Aws account having EC2 available[/]") + Formatador.display_line("[yellow]Skipping test [bold]with default vpc[/][yellow] due to AWS account having EC2 available[/]") else elb2 = Fog::AWS[:elb].load_balancers.create(:id => "#{elb_id}-2", :availability_zones => @availability_zones[0]) tests("elb source group should start with default_elb_").returns(true) { !!(elb2.source_group["GroupName"] =~ /default_elb_/) } @@ -101,7 +101,7 @@ Shindo.tests('Aws::ELB | models', ['aws', 'elb']) do # Need to sleep here for IAM changes to propgate tests('with ListenerDescriptions') do - @certificate = Fog::AWS[:iam].upload_server_certificate(Aws::IAM::SERVER_CERT, Aws::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate'] + @certificate = Fog::AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate'] sleep(10) unless Fog.mocking? listeners = [{ 'Listener' => { @@ -239,11 +239,11 @@ Shindo.tests('Aws::ELB | models', ['aws', 'elb']) do tests('configure_health_check') do new_health_check = { - "HealthyThreshold" => 5, - "Timeout" => 10, - "UnhealthyThreshold" => 3, - "Interval" => 15, - "Target" => "HTTP:80/index.html" + "HealthyThreshold"=>5, + "Timeout"=>10, + "UnhealthyThreshold"=>3, + "Interval"=>15, + "Target"=>"HTTP:80/index.html" } elb.configure_health_check(new_health_check) returns(new_health_check) { elb.health_check } @@ -318,12 +318,12 @@ Shindo.tests('Aws::ELB | models', ['aws', 'elb']) do public_key_policy_id = 'fog-public-key-policy' tests('create public key policy') do - elb.policies.create(:id => public_key_policy_id, :type_name => 'PublicKeyPolicyType', :policy_attributes => {'PublicKey' => Aws::IAM::SERVER_CERT_PUBLIC_KEY}) + elb.policies.create(:id => public_key_policy_id, :type_name => 'PublicKeyPolicyType', :policy_attributes => {'PublicKey' => AWS::IAM::SERVER_CERT_PUBLIC_KEY}) policy = elb.policies.get(public_key_policy_id) returns(public_key_policy_id) { policy.id } returns("PublicKeyPolicyType") { policy.type_name } - returns(Aws::IAM::SERVER_CERT_PUBLIC_KEY) { policy.policy_attributes["PublicKey"] } + returns(AWS::IAM::SERVER_CERT_PUBLIC_KEY) { policy.policy_attributes["PublicKey"] } end tests('a malformed policy') do diff --git a/tests/models/elb/tagging_tests.rb b/tests/models/elb/tagging_tests.rb index b2faad868..af95a5ed0 100644 --- a/tests/models/elb/tagging_tests.rb +++ b/tests/models/elb/tagging_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::ELB | tagging", ['aws', 'elb']) do +Shindo.tests("AWS::ELB | tagging", ['aws', 'elb']) do @elb5 = Fog::AWS[:elb].load_balancers.create(:id => "fog-test-elb-tagging") tags1 = {'key1' => 'val1'} tags2 = {'key2' => 'val2'} diff --git a/tests/models/glacier/model_tests.rb b/tests/models/glacier/model_tests.rb index 31c302516..3fd9d41d3 100644 --- a/tests/models/glacier/model_tests.rb +++ b/tests/models/glacier/model_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Glacier | models', ['aws', 'glacier']) do +Shindo.tests('AWS::Glacier | models', ['aws', 'glacier']) do pending if Fog.mocking? tests('success') do tests('vaults') do diff --git a/tests/models/rds/event_subscription_tests.rb b/tests/models/rds/event_subscription_tests.rb index b3378ead2..4557b6302 100644 --- a/tests/models/rds/event_subscription_tests.rb +++ b/tests/models/rds/event_subscription_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | event_subscription", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | event_subscription", ['aws', 'rds']) do pending unless Fog.mocking? name = 'fog' diff --git a/tests/models/rds/event_subscriptions_tests.rb b/tests/models/rds/event_subscriptions_tests.rb index 07659e49a..002253103 100644 --- a/tests/models/rds/event_subscriptions_tests.rb +++ b/tests/models/rds/event_subscriptions_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | event subscriptions", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | event subscriptions", ['aws', 'rds']) do pending unless Fog.mocking? params = {:id => "fog", :sns_topic_arn => 'arn:aws:sns:us-east-1:12345678910:fog'} diff --git a/tests/models/rds/instance_option_tests.rb b/tests/models/rds/instance_option_tests.rb index afc85dcbc..15d919a1f 100644 --- a/tests/models/rds/instance_option_tests.rb +++ b/tests/models/rds/instance_option_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | db instance options", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | db instance options", ['aws', 'rds']) do params = {:engine => 'mysql'} diff --git a/tests/models/rds/parameter_group_tests.rb b/tests/models/rds/parameter_group_tests.rb index 1bdf176df..2cae85105 100644 --- a/tests/models/rds/parameter_group_tests.rb +++ b/tests/models/rds/parameter_group_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | parameter_group", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | parameter_group", ['aws', 'rds']) do group_name = 'fog-test' params = {:id => group_name, :family => 'mysql5.1', :description => group_name} diff --git a/tests/models/rds/parameter_groups_tests.rb b/tests/models/rds/parameter_groups_tests.rb index 7ca1d2429..786b2e78a 100644 --- a/tests/models/rds/parameter_groups_tests.rb +++ b/tests/models/rds/parameter_groups_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | parameter_groups", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | parameter_groups", ['aws', 'rds']) do group_name = 'fog-test' params = {:id => group_name, :family => 'mysql5.1', :description => group_name} diff --git a/tests/models/rds/security_group_tests.rb b/tests/models/rds/security_group_tests.rb index ebb7932b6..cf42f6be8 100644 --- a/tests/models/rds/security_group_tests.rb +++ b/tests/models/rds/security_group_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | security_group", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | security_group", ['aws', 'rds']) do group_name = 'fog-test' params = {:id => group_name, :description => 'fog test'} diff --git a/tests/models/rds/security_groups_tests.rb b/tests/models/rds/security_groups_tests.rb index 0726f96bb..22f06fee4 100644 --- a/tests/models/rds/security_groups_tests.rb +++ b/tests/models/rds/security_groups_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | security groups", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | security groups", ['aws', 'rds']) do params = {:id => 'fog-test', :description => 'fog test'} collection_tests(Fog::AWS[:rds].security_groups, params) diff --git a/tests/models/rds/server_tests.rb b/tests/models/rds/server_tests.rb index e61c9f2ee..0594caf62 100644 --- a/tests/models/rds/server_tests.rb +++ b/tests/models/rds/server_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | server", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do # Disabled due to https://github.com/fog/fog/1546 pending diff --git a/tests/models/rds/servers_tests.rb b/tests/models/rds/servers_tests.rb index d0be89602..454e305bf 100644 --- a/tests/models/rds/servers_tests.rb +++ b/tests/models/rds/servers_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | servers", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | servers", ['aws', 'rds']) do collection_tests(Fog::AWS[:rds].servers, rds_default_server_params) do @instance.wait_for { ready? } diff --git a/tests/models/rds/snapshot_tests.rb b/tests/models/rds/snapshot_tests.rb index d2f0fc389..66e1e3208 100644 --- a/tests/models/rds/snapshot_tests.rb +++ b/tests/models/rds/snapshot_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | snapshot", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | snapshot", ['aws', 'rds']) do @server = Fog::AWS[:rds].servers.create(rds_default_server_params) @server.wait_for { ready? } diff --git a/tests/models/rds/snapshots_tests.rb b/tests/models/rds/snapshots_tests.rb index 4048d7226..0e69ec72b 100644 --- a/tests/models/rds/snapshots_tests.rb +++ b/tests/models/rds/snapshots_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | snapshots", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | snapshots", ['aws', 'rds']) do @server = Fog::AWS[:rds].servers.create(rds_default_server_params) @server.wait_for { ready? } diff --git a/tests/models/rds/tagging_tests.rb b/tests/models/rds/tagging_tests.rb index ef8d762c4..62d711646 100644 --- a/tests/models/rds/tagging_tests.rb +++ b/tests/models/rds/tagging_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::RDS | tagging", ['aws', 'rds']) do +Shindo.tests("AWS::RDS | tagging", ['aws', 'rds']) do @server = Fog::AWS[:rds].servers.create(rds_default_server_params) Formatador.display_line "Creating RDS instance #{@server.id}" diff --git a/tests/models/sns/topic_tests.rb b/tests/models/sns/topic_tests.rb index 8d80492fb..614edfe2b 100644 --- a/tests/models/sns/topic_tests.rb +++ b/tests/models/sns/topic_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::SNS | topic", ['aws', 'sns']) do +Shindo.tests("AWS::SNS | topic", ['aws', 'sns']) do params = {:id => 'fog'} model_tests(Fog::AWS[:sns].topics, params) do diff --git a/tests/models/sns/topics_tests.rb b/tests/models/sns/topics_tests.rb index bb26675cd..d835cf1e2 100644 --- a/tests/models/sns/topics_tests.rb +++ b/tests/models/sns/topics_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Aws::SNS | topics", ['aws', 'sns']) do +Shindo.tests("AWS::SNS | topics", ['aws', 'sns']) do pending unless Fog.mocking? params = {:id => 'arn:aws:sns:us-east-1:12345678910:fog'} diff --git a/tests/models/storage/url_tests.rb b/tests/models/storage/url_tests.rb index 2a0628465..48a69e63d 100644 --- a/tests/models/storage/url_tests.rb +++ b/tests/models/storage/url_tests.rb @@ -1,10 +1,10 @@ # encoding: utf-8 -Shindo.tests('Aws | url', ["aws"]) do +Shindo.tests('AWS | url', ["aws"]) do @storage = Fog::Storage.new( - :provider => 'Aws', + :provider => 'AWS', :aws_access_key_id => '123', :aws_secret_access_key => 'abc', :region => 'us-east-1' @@ -15,7 +15,7 @@ Shindo.tests('Aws | url', ["aws"]) do now = Fog::Time.now if RUBY_VERSION > '1.8.7' # ruby 1.8.x doesn't provide hash ordering tests('#url w/ response-cache-control').returns( - "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&X-Amz-Expires=500&X-Amz-Date=#{now.to_iso8601_basic}&X-Amz-Algorithm=Aws4-HMAC-SHA256&X-Amz-Credential=123/#{now.utc.strftime('%Y%m%d')}/us-east-1/s3/aws4_request&X-Amz-SignedHeaders=host&X-Amz-Signature=" + "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&X-Amz-Expires=500&X-Amz-Date=#{now.to_iso8601_basic}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=123/#{now.utc.strftime('%Y%m%d')}/us-east-1/s3/aws4_request&X-Amz-SignedHeaders=host&X-Amz-Signature=" ) do @file.url(Time.now + 500, :query => { 'response-cache-control' => 'No-cache' }).gsub(/(X-Amz-Signature=)[0-9a-f]+\z/,'\\1') diff --git a/tests/parsers/elb/describe_load_balancers.rb b/tests/parsers/elb/describe_load_balancers.rb index 8efcebe66..115dbeffa 100644 --- a/tests/parsers/elb/describe_load_balancers.rb +++ b/tests/parsers/elb/describe_load_balancers.rb @@ -56,8 +56,8 @@ xmlns="http://elasticloadbalancing.amazonaws.com/doc/2012-06-01/"> EOF -Shindo.tests('Aws::ELB | parsers | describe_load_balancers', ['aws', 'elb', 'parser']) do - tests('parses the xml').formats(Aws::ELB::Formats::DESCRIBE_LOAD_BALANCERS) do +Shindo.tests('AWS::ELB | parsers | describe_load_balancers', ['aws', 'elb', 'parser']) do + tests('parses the xml').formats(AWS::ELB::Formats::DESCRIBE_LOAD_BALANCERS) do parser = Nokogiri::XML::SAX::Parser.new(Fog::Parsers::AWS::ELB::DescribeLoadBalancers.new) parser.parse(DESCRIBE_LOAD_BALANCERS_RESULT) parser.document.response diff --git a/tests/requests/auto_scaling/auto_scaling_tests.rb b/tests/requests/auto_scaling/auto_scaling_tests.rb index e0a13a61b..cdc586ce3 100644 --- a/tests/requests/auto_scaling/auto_scaling_tests.rb +++ b/tests/requests/auto_scaling/auto_scaling_tests.rb @@ -1,68 +1,68 @@ -Shindo.tests('Aws::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) do +Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) do @asg_name = 'fog-test-asg' @lc_name = 'fog-test-lc' tests('success') do - tests("#create_launch_configuration").formats(Aws::AutoScaling::Formats::BASIC) do + tests("#create_launch_configuration").formats(AWS::AutoScaling::Formats::BASIC) do image_id = 'ami-8c1fece5' instance_type = 't1.micro' #listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'http'}] Fog::AWS[:auto_scaling].create_launch_configuration(image_id, instance_type, @lc_name).body end - tests("#describe_launch_configurations").formats(Aws::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do + tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do Fog::AWS[:auto_scaling].describe_launch_configurations().body end - tests("#describe_launch_configurations").formats(Aws::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do + tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do Fog::AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => @lc_name).body end - tests("#describe_launch_configurations").formats(Aws::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do + tests("#describe_launch_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_LAUNCH_CONFIGURATIONS) do Fog::AWS[:auto_scaling].describe_launch_configurations('LaunchConfigurationNames' => [@lc_name]).body end - tests("#create_auto_scaling_group").formats(Aws::AutoScaling::Formats::BASIC) do + tests("#create_auto_scaling_group").formats(AWS::AutoScaling::Formats::BASIC) do zones = ['us-east-1d'] max_size = 0 min_size = 0 Fog::AWS[:auto_scaling].create_auto_scaling_group(@asg_name, zones, @lc_name, max_size, min_size).body end - tests("#describe_auto_scaling_groups").formats(Aws::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do + tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do Fog::AWS[:auto_scaling].describe_auto_scaling_groups().body end - tests("#describe_auto_scaling_groups").formats(Aws::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do + tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do Fog::AWS[:auto_scaling].describe_auto_scaling_groups('AutoScalingGroupNames' => @asg_name).body end - tests("#describe_auto_scaling_groups").formats(Aws::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do + tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do Fog::AWS[:auto_scaling].describe_auto_scaling_groups('AutoScalingGroupNames' => [@asg_name]).body end - tests("#describe_auto_scaling_instances").formats(Aws::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_INSTANCES) do + tests("#describe_auto_scaling_instances").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_INSTANCES) do Fog::AWS[:auto_scaling].describe_auto_scaling_instances().body end - tests("#describe_scaling_activities").formats(Aws::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do + tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do pending if Fog.mocking? Fog::AWS[:auto_scaling].describe_scaling_activities().body end - tests("#describe_scaling_activities").formats(Aws::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do + tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do pending if Fog.mocking? Fog::AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => '1').body end - tests("#describe_scaling_activities").formats(Aws::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do + tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do pending if Fog.mocking? Fog::AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => ['1', '2']).body end - tests("#describe_scaling_activities").formats(Aws::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do + tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do pending if Fog.mocking? Fog::AWS[:auto_scaling].describe_scaling_activities('AutoScalingGroupName' => @asg_name).body end - tests("#set_desired_capacity").formats(Aws::AutoScaling::Formats::BASIC) do + tests("#set_desired_capacity").formats(AWS::AutoScaling::Formats::BASIC) do desired_capacity = 0 Fog::AWS[:auto_scaling].set_desired_capacity(@asg_name, desired_capacity).body end - tests("#delete_auto_scaling_group").formats(Aws::AutoScaling::Formats::BASIC) do + tests("#delete_auto_scaling_group").formats(AWS::AutoScaling::Formats::BASIC) do Fog::AWS[:auto_scaling].delete_auto_scaling_group(@asg_name, 'ForceDelete' => true).body end @@ -70,7 +70,7 @@ Shindo.tests('Aws::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d Fog::AWS[:auto_scaling].delete_auto_scaling_group("group that does not exist") end - tests("#delete_launch_configuration").formats(Aws::AutoScaling::Formats::BASIC) do + tests("#delete_launch_configuration").formats(AWS::AutoScaling::Formats::BASIC) do Fog::AWS[:auto_scaling].delete_launch_configuration(@lc_name).body end end diff --git a/tests/requests/auto_scaling/describe_types_tests.rb b/tests/requests/auto_scaling/describe_types_tests.rb index 0986a6c14..216915cf5 100644 --- a/tests/requests/auto_scaling/describe_types_tests.rb +++ b/tests/requests/auto_scaling/describe_types_tests.rb @@ -1,8 +1,8 @@ -Shindo.tests('Aws::AutoScaling | describe types requests', ['aws', 'auto_scaling']) do +Shindo.tests('AWS::AutoScaling | describe types requests', ['aws', 'auto_scaling']) do tests('success') do - tests("#describe_adjustment_types").formats(Aws::AutoScaling::Formats::DESCRIBE_ADJUSTMENT_TYPES) do + tests("#describe_adjustment_types").formats(AWS::AutoScaling::Formats::DESCRIBE_ADJUSTMENT_TYPES) do body = Fog::AWS[:auto_scaling].describe_adjustment_types.body [ 'ChangeInCapacity', @@ -17,7 +17,7 @@ Shindo.tests('Aws::AutoScaling | describe types requests', ['aws', 'auto_scaling body end - tests("#describe_auto_scaling_notification_types").formats(Aws::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_NOTIFICATION_TYPES) do + tests("#describe_auto_scaling_notification_types").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_NOTIFICATION_TYPES) do body = Fog::AWS[:auto_scaling].describe_auto_scaling_notification_types.body [ 'autoscaling:EC2_INSTANCE_LAUNCH', @@ -34,7 +34,7 @@ Shindo.tests('Aws::AutoScaling | describe types requests', ['aws', 'auto_scaling body end - tests("#describe_metric_collection_types").formats(Aws::AutoScaling::Formats::DESCRIBE_METRIC_COLLECTION_TYPES) do + tests("#describe_metric_collection_types").formats(AWS::AutoScaling::Formats::DESCRIBE_METRIC_COLLECTION_TYPES) do body = Fog::AWS[:auto_scaling].describe_metric_collection_types.body [ 'GroupDesiredCapacity', @@ -60,7 +60,7 @@ Shindo.tests('Aws::AutoScaling | describe types requests', ['aws', 'auto_scaling body end - tests("#describe_scaling_process_types").formats(Aws::AutoScaling::Formats::DESCRIBE_SCALING_PROCESS_TYPES) do + tests("#describe_scaling_process_types").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_PROCESS_TYPES) do body = Fog::AWS[:auto_scaling].describe_scaling_process_types.body [ 'AZRebalance', @@ -80,7 +80,7 @@ Shindo.tests('Aws::AutoScaling | describe types requests', ['aws', 'auto_scaling body end - tests("#describe_termination_policy_types").formats(Aws::AutoScaling::Formats::DESCRIBE_TERMINATION_POLICY_TYPES) do + tests("#describe_termination_policy_types").formats(AWS::AutoScaling::Formats::DESCRIBE_TERMINATION_POLICY_TYPES) do body = Fog::AWS[:auto_scaling].describe_termination_policy_types.body [ 'ClosestToNextInstanceHour', diff --git a/tests/requests/auto_scaling/helper.rb b/tests/requests/auto_scaling/helper.rb index af66cf390..570dbd706 100644 --- a/tests/requests/auto_scaling/helper.rb +++ b/tests/requests/auto_scaling/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module AutoScaling module Formats BASIC = { diff --git a/tests/requests/auto_scaling/model_tests.rb b/tests/requests/auto_scaling/model_tests.rb index 1c5cbdc72..be07e1e36 100644 --- a/tests/requests/auto_scaling/model_tests.rb +++ b/tests/requests/auto_scaling/model_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::AutoScaling | model_tests', ['aws', 'auto_scaling']) do +Shindo.tests('AWS::AutoScaling | model_tests', ['aws', 'auto_scaling']) do tests('success') do lc = nil diff --git a/tests/requests/auto_scaling/notification_configuration_tests.rb b/tests/requests/auto_scaling/notification_configuration_tests.rb index 0ec6fa5e8..74ccd42c8 100644 --- a/tests/requests/auto_scaling/notification_configuration_tests.rb +++ b/tests/requests/auto_scaling/notification_configuration_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::AutoScaling | notification configuration requests', ['aws', 'auto_scaling']) do +Shindo.tests('AWS::AutoScaling | notification configuration requests', ['aws', 'auto_scaling']) do image_id = { # Ubuntu 12.04 LTS 64-bit EBS 'ap-northeast-1' => 'ami-60c77761', @@ -37,12 +37,12 @@ Shindo.tests('Aws::AutoScaling | notification configuration requests', ['aws', ' end tests('success') do - tests("#put_notification_configuration(string)").formats(Aws::AutoScaling::Formats::BASIC) do + tests("#put_notification_configuration(string)").formats(AWS::AutoScaling::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:auto_scaling].put_notification_configuration(asg_name, 'autoscaling:TEST_NOTIFICATION', topic_arn).body end - tests("#describe_notification_configurations").formats(Aws::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do + tests("#describe_notification_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do pending if Fog.mocking? body = Fog::AWS[:auto_scaling].describe_notification_configurations('AutoScalingGroupNames' => asg_name).body notification_configurations = body['DescribeNotificationConfigurationsResult']['NotificationConfigurations'] @@ -56,12 +56,12 @@ Shindo.tests('Aws::AutoScaling | notification configuration requests', ['aws', ' body end - tests("#put_notification_configuration(array)").formats(Aws::AutoScaling::Formats::BASIC) do + tests("#put_notification_configuration(array)").formats(AWS::AutoScaling::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:auto_scaling].put_notification_configuration(asg_name, ['autoscaling:EC2_INSTANCE_LAUNCH', 'autoscaling:EC2_INSTANCE_TERMINATE'], topic_arn).body end - tests("#describe_notification_configurations").formats(Aws::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do + tests("#describe_notification_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do pending if Fog.mocking? body = Fog::AWS[:auto_scaling].describe_notification_configurations('AutoScalingGroupName' => asg_name).body notification_configurations = body['DescribeNotificationConfigurationsResult']['NotificationConfigurations'] @@ -78,7 +78,7 @@ Shindo.tests('Aws::AutoScaling | notification configuration requests', ['aws', ' body end - tests("#describe_notification_configurations(all)").formats(Aws::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do + tests("#describe_notification_configurations(all)").formats(AWS::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do pending if Fog.mocking? body = Fog::AWS[:auto_scaling].describe_notification_configurations().body notification_configurations = body['DescribeNotificationConfigurationsResult']['NotificationConfigurations'] @@ -96,12 +96,12 @@ Shindo.tests('Aws::AutoScaling | notification configuration requests', ['aws', ' body end - tests("#delete_notification_configuration").formats(Aws::AutoScaling::Formats::BASIC) do + tests("#delete_notification_configuration").formats(AWS::AutoScaling::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:auto_scaling].delete_notification_configuration(asg_name, topic_arn).body end - tests("#describe_notification_configurations").formats(Aws::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do + tests("#describe_notification_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do pending if Fog.mocking? body = Fog::AWS[:auto_scaling].describe_notification_configurations('AutoScalingGroupNames' => asg_name).body returns(true) do diff --git a/tests/requests/auto_scaling/tag_tests.rb b/tests/requests/auto_scaling/tag_tests.rb index c84777372..f44506544 100644 --- a/tests/requests/auto_scaling/tag_tests.rb +++ b/tests/requests/auto_scaling/tag_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::AutoScaling | tag requests', ['aws', 'auto_scaling']) do +Shindo.tests('AWS::AutoScaling | tag requests', ['aws', 'auto_scaling']) do image_id = { # Ubuntu 12.04 LTS 64-bit EBS 'ap-northeast-1' => 'ami-60c77761', @@ -37,7 +37,7 @@ Shindo.tests('Aws::AutoScaling | tag requests', ['aws', 'auto_scaling']) do end tests('success') do - tests("#describe_auto_scaling_groups(#{asg_name}").formats(Aws::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do + tests("#describe_auto_scaling_groups(#{asg_name}").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do body = Fog::AWS[:auto_scaling].describe_auto_scaling_groups('AutoScalingGroupNames' => asg_name).body auto_scaling_group = body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].first returns(true) { auto_scaling_group.key?('Tags') } @@ -46,7 +46,7 @@ Shindo.tests('Aws::AutoScaling | tag requests', ['aws', 'auto_scaling']) do body end - tests("#describe_tags").formats(Aws::AutoScaling::Formats::DESCRIBE_TAGS) do + tests("#describe_tags").formats(AWS::AutoScaling::Formats::DESCRIBE_TAGS) do pending if Fog.mocking? body = Fog::AWS[:auto_scaling].describe_tags.body tags = body['DescribeTagsResult']['Tags'] diff --git a/tests/requests/beanstalk/application_tests.rb b/tests/requests/beanstalk/application_tests.rb index cf1e4929f..6e3ed02de 100644 --- a/tests/requests/beanstalk/application_tests.rb +++ b/tests/requests/beanstalk/application_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::ElasticBeanstalk | application_tests', ['aws', 'beanstalk']) do +Shindo.tests('AWS::ElasticBeanstalk | application_tests', ['aws', 'beanstalk']) do def unique_name(prefix) #get time (with 1/100th of sec accuracy) diff --git a/tests/requests/beanstalk/solution_stack_tests.rb b/tests/requests/beanstalk/solution_stack_tests.rb index 27375e469..809ac3c54 100644 --- a/tests/requests/beanstalk/solution_stack_tests.rb +++ b/tests/requests/beanstalk/solution_stack_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::ElasticBeanstalk | solution_stack_tests', ['aws', 'beanstalk']) do +Shindo.tests('AWS::ElasticBeanstalk | solution_stack_tests', ['aws', 'beanstalk']) do tests('success') do pending if Fog.mocking? diff --git a/tests/requests/cloud_formation/stack_tests.rb b/tests/requests/cloud_formation/stack_tests.rb index f49085e4a..3fb72aeb8 100644 --- a/tests/requests/cloud_formation/stack_tests.rb +++ b/tests/requests/cloud_formation/stack_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::CloudFormation | stack requests', ['aws', 'cloudformation']) do +Shindo.tests('AWS::CloudFormation | stack requests', ['aws', 'cloudformation']) do @validate_template_format = { 'Description' => String, diff --git a/tests/requests/cloud_watch/get_metric_statistics_tests.rb b/tests/requests/cloud_watch/get_metric_statistics_tests.rb index 2246aa59a..8379578cd 100644 --- a/tests/requests/cloud_watch/get_metric_statistics_tests.rb +++ b/tests/requests/cloud_watch/get_metric_statistics_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::CloudWatch | metric requests', ['aws', 'cloudwatch']) do +Shindo.tests('AWS::CloudWatch | metric requests', ['aws', 'cloudwatch']) do tests('success') do @metrics_statistic_format = { @@ -22,7 +22,7 @@ Shindo.tests('Aws::CloudWatch | metric requests', ['aws', 'cloudwatch']) do tests("#get_metric_statistics").formats(@metrics_statistic_format) do pending if Fog.mocking? instanceId = 'i-420c352f' - Fog::AWS[:cloud_watch].get_metric_statistics({'Statistics' => ['Minimum','Maximum','Sum','SampleCount','Average'], 'StartTime' => (Time.now-600).iso8601, 'EndTime' => Time.now.iso8601, 'Period' => 60, 'MetricName' => 'DiskReadBytes', 'Namespace' => 'Aws/EC2', 'Dimensions' => [{'Name' => 'InstanceId', 'Value' => instanceId}]}).body + Fog::AWS[:cloud_watch].get_metric_statistics({'Statistics' => ['Minimum','Maximum','Sum','SampleCount','Average'], 'StartTime' => (Time.now-600).iso8601, 'EndTime' => Time.now.iso8601, 'Period' => 60, 'MetricName' => 'DiskReadBytes', 'Namespace' => 'AWS/EC2', 'Dimensions' => [{'Name' => 'InstanceId', 'Value' => instanceId}]}).body end end end diff --git a/tests/requests/cloud_watch/list_metrics_test.rb b/tests/requests/cloud_watch/list_metrics_test.rb index 770deb783..36584aecb 100644 --- a/tests/requests/cloud_watch/list_metrics_test.rb +++ b/tests/requests/cloud_watch/list_metrics_test.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::CloudWatch | metric requests', ['aws', 'cloudwatch']) do +Shindo.tests('AWS::CloudWatch | metric requests', ['aws', 'cloudwatch']) do tests('success') do @metrics_list_format = { @@ -55,7 +55,7 @@ Shindo.tests('Aws::CloudWatch | metric requests', ['aws', 'cloudwatch']) do tests("#namespace_filtered_list_metrics").returns(true) do pending if Fog.mocking? - namespace = "Aws/EC2" + namespace = "AWS/EC2" Fog::AWS[:cloud_watch].list_metrics('Namespace' => namespace).body['ListMetricsResult']['Metrics'].all? do |metric| metric['Namespace'] == namespace end diff --git a/tests/requests/cloud_watch/put_metric_data_tests.rb b/tests/requests/cloud_watch/put_metric_data_tests.rb index 3943733b4..ed0381a0f 100644 --- a/tests/requests/cloud_watch/put_metric_data_tests.rb +++ b/tests/requests/cloud_watch/put_metric_data_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::CloudWatch | metric requests', ['aws', 'cloudwatch']) do +Shindo.tests('AWS::CloudWatch | metric requests', ['aws', 'cloudwatch']) do tests('success') do namespace = 'Custom/Test' diff --git a/tests/requests/compute/address_tests.rb b/tests/requests/compute/address_tests.rb index a45abd660..9e6e04f83 100644 --- a/tests/requests/compute/address_tests.rb +++ b/tests/requests/compute/address_tests.rb @@ -41,31 +41,31 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do Fog::Compute[:aws].describe_addresses('public-ip' => @public_ip).body end - tests("#associate_addresses('#{@server.identity}', '#{@public_ip}')").formats(Aws::Compute::Formats::BASIC) do + tests("#associate_addresses('#{@server.identity}', '#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].associate_address(@server.identity, @public_ip).body end - tests("#associate_addresses({:instance_id=>'#{@server.identity}', :public_ip=>'#{@public_ip}'})").formats(Aws::Compute::Formats::BASIC) do + tests("#associate_addresses({:instance_id=>'#{@server.identity}', :public_ip=>'#{@public_ip}'})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].associate_address({:instance_id=>@server.identity,:public_ip=> @public_ip}).body end - tests("#dissassociate_address('#{@public_ip}')").formats(Aws::Compute::Formats::BASIC) do + tests("#dissassociate_address('#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].disassociate_address(@public_ip).body end - tests("#associate_addresses('#{@server.id}', nil, nil, '#{@vpc_allocation_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#associate_addresses('#{@server.id}', nil, nil, '#{@vpc_allocation_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].associate_address(@server.id, nil, nil, @vpc_allocation_id).body end - tests("#associate_addresses({:instance_id=>'#{@server.id}', :allocation_id=>'#{@vpc_allocation_id}'})").formats(Aws::Compute::Formats::BASIC) do + tests("#associate_addresses({:instance_id=>'#{@server.id}', :allocation_id=>'#{@vpc_allocation_id}'})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].associate_address({:instance_id=>@server.id, :allocation_id=>@vpc_allocation_id}).body end - tests("#release_address('#{@public_ip}')").formats(Aws::Compute::Formats::BASIC) do + tests("#release_address('#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].release_address(@public_ip).body end - tests("#release_address('#{@vpc_allocation_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#release_address('#{@vpc_allocation_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].release_address(@vpc_allocation_id).body end end diff --git a/tests/requests/compute/assign_private_ip_tests.rb b/tests/requests/compute/assign_private_ip_tests.rb index 94028d3cf..0ad005ede 100644 --- a/tests/requests/compute/assign_private_ip_tests.rb +++ b/tests/requests/compute/assign_private_ip_tests.rb @@ -16,11 +16,11 @@ Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do @ip_address = Fog::AWS::Mock.ip_address @second_ip_address = Fog::AWS::Mock.ip_address - tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}']})").formats(Aws::Compute::Formats::BASIC) do + tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}']})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, { 'PrivateIpAddresses' =>[@ip_address, @second_ip_address]}).body end - tests("#assign_private_ip_addresses('#{@network_interface_id}', {'SecondaryPrivateIpAddressCount'=>4})").formats(Aws::Compute::Formats::BASIC) do + tests("#assign_private_ip_addresses('#{@network_interface_id}', {'SecondaryPrivateIpAddressCount'=>4})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, {'SecondaryPrivateIpAddressCount'=>4}).body end diff --git a/tests/requests/compute/dhcp_options_tests.rb b/tests/requests/compute/dhcp_options_tests.rb index b590ad618..f222e25bb 100644 --- a/tests/requests/compute/dhcp_options_tests.rb +++ b/tests/requests/compute/dhcp_options_tests.rb @@ -23,15 +23,15 @@ Shindo.tests('Fog::Compute[:aws] | dhcp_options requests', ['aws']) do Fog::Compute[:aws].describe_dhcp_options.body end - tests("#associate_dhcp_options('#{@dopt_id}, #{@vpc_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#associate_dhcp_options('#{@dopt_id}, #{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].associate_dhcp_options(@dopt_id, @vpc_id).body end - tests("#associate_default_dhcp_options('default', #{@vpc_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#associate_default_dhcp_options('default', #{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].associate_dhcp_options('default', @vpc_id).body end - tests("#delete_dhcp_options('#{@dopt_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_dhcp_options('#{@dopt_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_dhcp_options(@dopt_id).body end @vpc.destroy diff --git a/tests/requests/compute/helper.rb b/tests/requests/compute/helper.rb index faf95e7dc..a6f49facc 100644 --- a/tests/requests/compute/helper.rb +++ b/tests/requests/compute/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module Compute module Formats BASIC = { diff --git a/tests/requests/compute/image_tests.rb b/tests/requests/compute/image_tests.rb index fd7a4fb83..2ba422ce1 100644 --- a/tests/requests/compute/image_tests.rb +++ b/tests/requests/compute/image_tests.rb @@ -138,7 +138,7 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do # for quicker tests: uncomment the rest of this block #Fog.wait_for { Fog::Compute.new(:provider => :aws, :region => "us-west-1").snapshots.get(@eu_image_id) } - #tests("#delete_snapshots(#{@eu_image_id})").formats(Aws::Compute::Formats::BASIC) do + #tests("#delete_snapshots(#{@eu_image_id})").formats(AWS::Compute::Formats::BASIC) do # Fog::Compute.new(:provider => :aws, :region => "us-west-1").delete_snapshot(@eu_image_id).body #end diff --git a/tests/requests/compute/instance_tests.rb b/tests/requests/compute/instance_tests.rb index 4346c9563..030277663 100644 --- a/tests/requests/compute/instance_tests.rb +++ b/tests/requests/compute/instance_tests.rb @@ -242,7 +242,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do key.destroy - tests("#reboot_instances('#{@instance_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#reboot_instances('#{@instance_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].reboot_instances(@instance_id).body end diff --git a/tests/requests/compute/internet_gateway_tests.rb b/tests/requests/compute/internet_gateway_tests.rb index 30f8d9787..be1c93e02 100644 --- a/tests/requests/compute/internet_gateway_tests.rb +++ b/tests/requests/compute/internet_gateway_tests.rb @@ -32,15 +32,15 @@ Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do Fog::Compute[:aws].describe_internet_gateways.body end - tests("#attach_internet_gateway('#{@igw_id}, #{@vpc_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#attach_internet_gateway('#{@igw_id}, #{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].attach_internet_gateway(@igw_id, @vpc_id).body end - tests("#detach_internet_gateway('#{@igw_id}, #{@vpc_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#detach_internet_gateway('#{@igw_id}, #{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].detach_internet_gateway(@igw_id, @vpc_id).body end - tests("#delete_internet_gateway('#{@igw_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_internet_gateway('#{@igw_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_internet_gateway(@igw_id).body end @subnet.destroy diff --git a/tests/requests/compute/key_pair_tests.rb b/tests/requests/compute/key_pair_tests.rb index 65e6f58f4..2deed34f8 100644 --- a/tests/requests/compute/key_pair_tests.rb +++ b/tests/requests/compute/key_pair_tests.rb @@ -35,7 +35,7 @@ Shindo.tests('Fog::Compute[:aws] | key pair requests', ['aws']) do Fog::Compute[:aws].describe_key_pairs('key-name' => @key_pair_name).body end - tests("#delete_key_pair('#{@key_pair_name}')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_key_pair('#{@key_pair_name}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_key_pair(@key_pair_name).body end diff --git a/tests/requests/compute/network_acl_tests.rb b/tests/requests/compute/network_acl_tests.rb index 809a66ecf..3004cf887 100644 --- a/tests/requests/compute/network_acl_tests.rb +++ b/tests/requests/compute/network_acl_tests.rb @@ -52,15 +52,15 @@ Shindo.tests('Fog::Compute[:aws] | network acl requests', ['aws']) do data['networkAcl'] end - tests("#create_network_acl_entry").formats(Aws::Compute::Formats::BASIC) do + tests("#create_network_acl_entry").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].create_network_acl_entry(@network_acl['networkAclId'], 100, 6, 'allow', '0.0.0.0/8', false, 'PortRange.From' => 22, 'PortRange.To' => 22).body end - tests("#replace_network_acl_entry").formats(Aws::Compute::Formats::BASIC) do + tests("#replace_network_acl_entry").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].replace_network_acl_entry(@network_acl['networkAclId'], 100, 6, 'deny', '0.0.0.0/8', false, 'PortRange.From' => 22, 'PortRange.To' => 22).body end - tests("#delete_network_acl_entry").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_network_acl_entry").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_network_acl_entry(@network_acl['networkAclId'], 100, false).body end @@ -98,7 +98,7 @@ Shindo.tests('Fog::Compute[:aws] | network acl requests', ['aws']) do body end - tests('#delete_network_acl').formats(Aws::Compute::Formats::BASIC) do + tests('#delete_network_acl').formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_network_acl(@network_acl['networkAclId']).body end diff --git a/tests/requests/compute/network_interface_tests.rb b/tests/requests/compute/network_interface_tests.rb index 2afdbc858..db3d927f4 100644 --- a/tests/requests/compute/network_interface_tests.rb +++ b/tests/requests/compute/network_interface_tests.rb @@ -169,10 +169,10 @@ Shindo.tests('Fog::Compute[:aws] | network interface requests', ['aws']) do end # Delete network interfaces - tests("#delete_network_interface('#{@nic2_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_network_interface('#{@nic2_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_network_interface(@nic2_id).body end - tests("#delete_network_interface('#{@nic_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_network_interface('#{@nic_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_network_interface(@nic_id).body end diff --git a/tests/requests/compute/placement_group_tests.rb b/tests/requests/compute/placement_group_tests.rb index 0f7002541..0d949f3ee 100644 --- a/tests/requests/compute/placement_group_tests.rb +++ b/tests/requests/compute/placement_group_tests.rb @@ -9,7 +9,7 @@ Shindo.tests('Fog::Compute[:aws] | placement group requests', ['aws']) do } tests('success') do - tests("#create_placement_group('fog_placement_group', 'cluster')").formats(Aws::Compute::Formats::BASIC) do + tests("#create_placement_group('fog_placement_group', 'cluster')").formats(AWS::Compute::Formats::BASIC) do pending if Fog.mocking? Fog::Compute[:aws].create_placement_group('fog_placement_group', 'cluster').body end @@ -24,7 +24,7 @@ Shindo.tests('Fog::Compute[:aws] | placement group requests', ['aws']) do Fog::Compute[:aws].describe_placement_groups('group-name' => 'fog_security_group').body end - tests("#delete_placement_group('fog_placement_group')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_placement_group('fog_placement_group')").formats(AWS::Compute::Formats::BASIC) do pending if Fog.mocking? Fog::Compute[:aws].delete_placement_group('fog_placement_group').body end diff --git a/tests/requests/compute/route_tests.rb b/tests/requests/compute/route_tests.rb index 0df175c7a..d6d775f93 100644 --- a/tests/requests/compute/route_tests.rb +++ b/tests/requests/compute/route_tests.rb @@ -79,17 +79,17 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do # - using network interface # Fog::Compute[:aws].attach_internet_gateway(@internet_gateway_id, vpc.id).body - tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', '#{@internet_gateway_id}', 'nil')").formats(Aws::Compute::Formats::BASIC) do + tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', '#{@internet_gateway_id}', 'nil')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, @internet_gateway_id, nil).body end instance = Fog::Compute[:aws].servers.create(:image_id => @ami, :flavor_id => 't1.micro', :key_name => 'fog-test-key', :subnet_id => @subnet_id) instance.wait_for { state.eql? "running" } - tests("#create_route('#{@route_table_id}', '10.0.10.0/22', 'nil', '#{instance.id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#create_route('#{@route_table_id}', '10.0.10.0/22', 'nil', '#{instance.id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].create_route(@route_table_id, '10.0.10.0/22', nil, instance.id).body end - tests("#create_route('#{@route_table_id}', '10.0.10.0/21', 'nil', 'nil', '#{@network_interface_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#create_route('#{@route_table_id}', '10.0.10.0/21', 'nil', 'nil', '#{@network_interface_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].create_route(@route_table_id, '10.0.10.0/21', nil, nil, @network_interface_id).body end @@ -99,17 +99,17 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do # - using network interface # Fog::Compute[:aws].attach_internet_gateway(@alt_internet_gateway_id, vpc.id).body - tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'gatewayId' => '#{@alt_internet_gateway_id}'})").formats(Aws::Compute::Formats::BASIC) do + tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'gatewayId' => '#{@alt_internet_gateway_id}'})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'gatewayId' => @alt_internet_gateway_id}).body end instance = Fog::Compute[:aws].servers.create(:image_id => @ami, :flavor_id => 't1.micro', :key_name => 'fog-test-key', :subnet_id => @subnet_id) instance.wait_for { state.eql? "running" } - tests("#replace_route('#{@route_table_id}', '10.0.10.0/22', {'instanceId' => '#{instance.id}'})").formats(Aws::Compute::Formats::BASIC) do + tests("#replace_route('#{@route_table_id}', '10.0.10.0/22', {'instanceId' => '#{instance.id}'})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].replace_route(@route_table_id, '10.0.10.0/22', {'instanceId' => instance.id}).body end - tests("#replace_route('#{@route_table_id}', '10.0.10.0/21', {'networkInterfaceId' => '#{@network_interface_id}'})").formats(Aws::Compute::Formats::BASIC) do + tests("#replace_route('#{@route_table_id}', '10.0.10.0/21', {'networkInterfaceId' => '#{@network_interface_id}'})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].replace_route(@route_table_id, '10.0.10.0/21', {'networkInterfaceId' => @network_interface_id}).body end @@ -130,10 +130,10 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do # Test delete_route(route_table_id, cidr_block) # - tests("#delete_route('#{@route_table_id}', '10.0.10.0/21')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_route('#{@route_table_id}', '10.0.10.0/21')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_route(@route_table_id, '10.0.10.0/21').body end - tests("#delete_route('#{@route_table_id}', '10.0.10.0/22')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_route('#{@route_table_id}', '10.0.10.0/22')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_route(@route_table_id, '10.0.10.0/22').body end @@ -141,19 +141,19 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do if !Fog.mocking? instance.wait_for { state.eql? "terminated" } end - tests("#delete_route('#{@route_table_id}', '#{@destination_cidr_block}')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_route('#{@route_table_id}', '#{@destination_cidr_block}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_route(@route_table_id, @destination_cidr_block).body end # Test disassociate_route_table(association_id) # - tests("#disassociate_route_table('#{@association_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#disassociate_route_table('#{@association_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].disassociate_route_table(@association_id).body end # Test delete_route_table(route_table_id) # - tests("#delete_route_table('#{@route_table_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_route_table('#{@route_table_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_route_table(@route_table_id).body end end diff --git a/tests/requests/compute/security_group_tests.rb b/tests/requests/compute/security_group_tests.rb index 488729d60..fe024c935 100644 --- a/tests/requests/compute/security_group_tests.rb +++ b/tests/requests/compute/security_group_tests.rb @@ -44,7 +44,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do expected_permissions = [] permission = { 'SourceSecurityGroupName' => 'default' } - tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permission).body end @@ -77,7 +77,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do end permission = { 'SourceSecurityGroupName' => 'fog_security_group_two', 'SourceSecurityGroupOwnerId' => @owner_id } - tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permission).body end @@ -112,7 +112,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do end permission = { 'IpProtocol' => 'tcp', 'FromPort' => '22', 'ToPort' => '22' } - tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permission).body end @@ -124,7 +124,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do end permission = { 'IpProtocol' => 'tcp', 'FromPort' => '22', 'ToPort' => '22', 'CidrIp' => '10.0.0.0/8' } - tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permission).body end @@ -148,7 +148,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do { 'IpProtocol' => 'tcp', 'FromPort' => '22', 'ToPort' => '22' } ] } - tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body end @@ -168,7 +168,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do } ] } - tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body end @@ -195,7 +195,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do } ] } - tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body end @@ -223,7 +223,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do } ] } - tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body end @@ -251,7 +251,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do end to_be_revoked.reverse.each do |permission, expected_permissions_after| - tests("#revoke_security_group_ingress('fog_security_group', #{permission.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#revoke_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].revoke_security_group_ingress('fog_security_group', permission).body end @@ -260,11 +260,11 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do end end - tests("#delete_security_group('fog_security_group')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_security_group('fog_security_group')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_security_group('fog_security_group').body end - tests("#delete_security_group('fog_security_group_two')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_security_group('fog_security_group_two')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_security_group('fog_security_group_two').body end @@ -294,7 +294,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do options = permissions.clone options['GroupId'] = group_id - tests("#authorize_security_group_ingress(#{options.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress(#{options.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress(options).body end @@ -302,7 +302,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'vpc_security_group').body['securityGroupInfo'].first['ipPermissions']) end - tests("#revoke_security_group_ingress(#{options.inspect})").formats(Aws::Compute::Formats::BASIC) do + tests("#revoke_security_group_ingress(#{options.inspect})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].revoke_security_group_ingress(options).body end @@ -343,7 +343,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do ) end - tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]}).body end @@ -351,7 +351,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]}) end - tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'Groups' => [{'GroupName' => '#{@other_security_group.name}'}], 'FromPort' => 80, 'ToPort' => 80, 'IpProtocol' => 'tcp'}]})").formats(Aws::Compute::Formats::BASIC) do + tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'Groups' => [{'GroupName' => '#{@other_security_group.name}'}], 'FromPort' => 80, 'ToPort' => 80, 'IpProtocol' => 'tcp'}]})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'Groups' => [{'GroupName' => @other_security_group.name}], 'FromPort' => 80, 'ToPort' => 80, 'IpProtocol' => 'tcp'}]}).body end diff --git a/tests/requests/compute/snapshot_tests.rb b/tests/requests/compute/snapshot_tests.rb index 6cd8c7187..0a904e1e4 100644 --- a/tests/requests/compute/snapshot_tests.rb +++ b/tests/requests/compute/snapshot_tests.rb @@ -51,7 +51,7 @@ Shindo.tests('Fog::Compute[:aws] | snapshot requests', ['aws']) do data end - tests("#delete_snapshots(#{@snapshot_id})").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_snapshots(#{@snapshot_id})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_snapshot(@snapshot_id).body end @@ -59,7 +59,7 @@ Shindo.tests('Fog::Compute[:aws] | snapshot requests', ['aws']) do #for faster tests: comment out the rest of this block Fog.wait_for { Fog::Compute.new(:provider => :aws, :region => "us-west-1").snapshots.get(@west_snapshot_id) } - tests("#delete_snapshots(#{@west_snapshot_id})").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_snapshots(#{@west_snapshot_id})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute.new(:provider => :aws, :region => "us-west-1").delete_snapshot(@west_snapshot_id).body end diff --git a/tests/requests/compute/spot_datafeed_subscription_tests.rb b/tests/requests/compute/spot_datafeed_subscription_tests.rb index 25fe7f95c..b4c4ff9a6 100644 --- a/tests/requests/compute/spot_datafeed_subscription_tests.rb +++ b/tests/requests/compute/spot_datafeed_subscription_tests.rb @@ -26,7 +26,7 @@ Shindo.tests('Fog::Compute[:aws] | spot datafeed subscription requests', ['aws'] Fog::Compute[:aws].describe_spot_datafeed_subscription.body end - tests("#delete_spot_datafeed_subscription").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_spot_datafeed_subscription").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_spot_datafeed_subscription.body end diff --git a/tests/requests/compute/subnet_tests.rb b/tests/requests/compute/subnet_tests.rb index 5e7e9a30a..201658eda 100644 --- a/tests/requests/compute/subnet_tests.rb +++ b/tests/requests/compute/subnet_tests.rb @@ -59,7 +59,7 @@ Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do Fog::Compute[:aws].describe_subnets.body end - tests("#delete_subnet('#{@subnet_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_subnet('#{@subnet_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_subnet(@subnet_id).body end end diff --git a/tests/requests/compute/tag_tests.rb b/tests/requests/compute/tag_tests.rb index 06f18d203..d01cc60c2 100644 --- a/tests/requests/compute/tag_tests.rb +++ b/tests/requests/compute/tag_tests.rb @@ -22,20 +22,20 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do @image_id = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1').body['imageId'] end - tests("#create_tags('#{@volume.identity}', 'foo' => 'bar')").formats(Aws::Compute::Formats::BASIC) do + tests("#create_tags('#{@volume.identity}', 'foo' => 'bar')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].create_tags(@volume.identity, 'foo' => 'bar').body end if Fog.mocking? - tests("#create_tags('#{@image_id}', 'foo' => 'baz')").formats(Aws::Compute::Formats::BASIC) do + tests("#create_tags('#{@image_id}', 'foo' => 'baz')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].create_tags(@image_id, 'foo' => 'baz').body end - tests("#create_tags('#{@vpc.id}', 'type' => 'vpc')").formats(Aws::Compute::Formats::BASIC) do + tests("#create_tags('#{@vpc.id}', 'type' => 'vpc')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].create_tags(@vpc.id, 'type' => 'vpc').body end - tests("#create_tags('#{@network_acl.network_acl_id}', 'type' => 'network_acl')").formats(Aws::Compute::Formats::BASIC) do + tests("#create_tags('#{@network_acl.network_acl_id}', 'type' => 'network_acl')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].create_tags(@network_acl.network_acl_id, 'type' => 'network_acl').body end end @@ -64,7 +64,7 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do @other_account.describe_tags('key' => 'foo', 'value' => 'baz').body['tagSet'].map {|t| t['resourceId'] } end - tests("other_account#create_tags('#{@image_id}', 'foo' => 'quux')").formats(Aws::Compute::Formats::BASIC) do + tests("other_account#create_tags('#{@image_id}', 'foo' => 'quux')").formats(AWS::Compute::Formats::BASIC) do @other_account.create_tags(@image_id, 'foo' => 'quux').body end @@ -75,7 +75,7 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do @volume.destroy - tests("#delete_tags('#{@volume.identity}', 'foo' => 'bar')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_tags('#{@volume.identity}', 'foo' => 'bar')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_tags(@volume.identity, 'foo' => 'bar').body end end diff --git a/tests/requests/compute/volume_tests.rb b/tests/requests/compute/volume_tests.rb index 1a3c9edd3..8d3824fe5 100644 --- a/tests/requests/compute/volume_tests.rb +++ b/tests/requests/compute/volume_tests.rb @@ -138,11 +138,11 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do Fog::Compute[:aws].volumes.get(@volume_id).wait_for { ready? } - tests("#modify_volume_attribute('#{@volume_id}', true)").formats(Aws::Compute::Formats::BASIC) do + tests("#modify_volume_attribute('#{@volume_id}', true)").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].modify_volume_attribute(@volume_id, true).body end - tests("#delete_volume('#{@volume_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_volume('#{@volume_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_volume(@volume_id).body end end diff --git a/tests/requests/compute/vpc_tests.rb b/tests/requests/compute/vpc_tests.rb index 5e930e4aa..cbdab3505 100644 --- a/tests/requests/compute/vpc_tests.rb +++ b/tests/requests/compute/vpc_tests.rb @@ -43,26 +43,26 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do end end - tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => false})").formats(Aws::Compute::Formats::BASIC) do + tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => false})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => false}).body end tests("#describe_vpc_attribute(#{@vpc_id}, 'enableDnsSupport')").returns(false) do Fog::Compute[:aws].describe_vpc_attribute(@vpc_id, 'enableDnsSupport').body["enableDnsSupport"] end - tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true})").formats(Aws::Compute::Formats::BASIC) do + tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => true}).body end tests("#describe_vpc_attribute(#{@vpc_id}, 'enableDnsSupport')").returns(true) do Fog::Compute[:aws].describe_vpc_attribute(@vpc_id, 'enableDnsSupport').body["enableDnsSupport"] end - tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsHostnames.Value' => true})").formats(Aws::Compute::Formats::BASIC) do + tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsHostnames.Value' => true})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsHostnames.Value' => true}).body end tests("#describe_vpc_attribute(#{@vpc_id}, 'enableDnsHostnames')").returns(true) do Fog::Compute[:aws].describe_vpc_attribute(@vpc_id, 'enableDnsHostnames').body["enableDnsHostnames"] end - tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsHostnames.Value' => false})").formats(Aws::Compute::Formats::BASIC) do + tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsHostnames.Value' => false})").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsHostnames.Value' => false}).body end tests("#describe_vpc_attribute(#{@vpc_id}, 'enableDnsHostnames')").returns(false) do @@ -99,7 +99,7 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do body end - tests("#delete_vpc('#{@vpc_id}')").formats(Aws::Compute::Formats::BASIC) do + tests("#delete_vpc('#{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do Fog::Compute[:aws].delete_vpc(@vpc_id).body end diff --git a/tests/requests/data_pipeline/helper.rb b/tests/requests/data_pipeline/helper.rb index 60a23cd18..21a8cf7e7 100644 --- a/tests/requests/data_pipeline/helper.rb +++ b/tests/requests/data_pipeline/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module DataPipeline module Formats BASIC = { diff --git a/tests/requests/data_pipeline/pipeline_tests.rb b/tests/requests/data_pipeline/pipeline_tests.rb index 06696fa40..ae8194da9 100644 --- a/tests/requests/data_pipeline/pipeline_tests.rb +++ b/tests/requests/data_pipeline/pipeline_tests.rb @@ -1,10 +1,10 @@ -Shindo.tests('Aws::DataPipeline | pipeline_tests', ['aws', 'data_pipeline']) do +Shindo.tests('AWS::DataPipeline | pipeline_tests', ['aws', 'data_pipeline']) do pending if Fog.mocking? @pipeline_id = nil tests('success') do - tests("#create_pipeline").formats(Aws::DataPipeline::Formats::BASIC) do + tests("#create_pipeline").formats(AWS::DataPipeline::Formats::BASIC) do unique_id = 'fog-test-pipeline-unique-id' name = 'fog-test-pipeline-name' description = 'Fog test pipeline' @@ -14,16 +14,16 @@ Shindo.tests('Aws::DataPipeline | pipeline_tests', ['aws', 'data_pipeline']) do result end - tests("#list_pipelines").formats(Aws::DataPipeline::Formats::LIST_PIPELINES) do + tests("#list_pipelines").formats(AWS::DataPipeline::Formats::LIST_PIPELINES) do Fog::AWS[:data_pipeline].list_pipelines() end - tests("#describe_pipelines").formats(Aws::DataPipeline::Formats::DESCRIBE_PIPELINES) do + tests("#describe_pipelines").formats(AWS::DataPipeline::Formats::DESCRIBE_PIPELINES) do ids = [@pipeline_id] Fog::AWS[:data_pipeline].describe_pipelines(ids) end - tests("#put_pipeline_definition").formats(Aws::DataPipeline::Formats::PUT_PIPELINE_DEFINITION) do + tests("#put_pipeline_definition").formats(AWS::DataPipeline::Formats::PUT_PIPELINE_DEFINITION) do objects = [ { "id" => "Nightly", @@ -46,25 +46,25 @@ Shindo.tests('Aws::DataPipeline | pipeline_tests', ['aws', 'data_pipeline']) do Fog::AWS[:data_pipeline].activate_pipeline(@pipeline_id) end - tests("#get_pipeline_definition").formats(Aws::DataPipeline::Formats::GET_PIPELINE_DEFINITION) do + tests("#get_pipeline_definition").formats(AWS::DataPipeline::Formats::GET_PIPELINE_DEFINITION) do Fog::AWS[:data_pipeline].get_pipeline_definition(@pipeline_id) end tests("#query_objects") do - tests("for COMPONENTs").formats(Aws::DataPipeline::Formats::QUERY_OBJECTS) do + tests("for COMPONENTs").formats(AWS::DataPipeline::Formats::QUERY_OBJECTS) do Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'COMPONENT') end - tests("for INSTANCEs").formats(Aws::DataPipeline::Formats::QUERY_OBJECTS) do + tests("for INSTANCEs").formats(AWS::DataPipeline::Formats::QUERY_OBJECTS) do Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'INSTANCE') end - tests("for ATTEMPTs").formats(Aws::DataPipeline::Formats::QUERY_OBJECTS) do + tests("for ATTEMPTs").formats(AWS::DataPipeline::Formats::QUERY_OBJECTS) do Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'ATTEMPT') end end - tests('#describe_objects').formats(Aws::DataPipeline::Formats::DESCRIBE_OBJECTS) do + tests('#describe_objects').formats(AWS::DataPipeline::Formats::DESCRIBE_OBJECTS) do attempts = Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'ATTEMPT') object_ids = attempts['ids'][0..5] Fog::AWS[:data_pipeline].describe_objects(@pipeline_id, object_ids) diff --git a/tests/requests/dns/dns_tests.rb b/tests/requests/dns/dns_tests.rb index 7696a6c02..1f9f68e44 100644 --- a/tests/requests/dns/dns_tests.rb +++ b/tests/requests/dns/dns_tests.rb @@ -74,7 +74,7 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do caller_ref = zone['CallerReference'] ns_servers = response.body['NameServers'] - # Aws returns domain with a dot at end - so when compare, remove dot + # AWS returns domain with a dot at end - so when compare, remove dot if (zone_id == @zone_id) and (name.chop == @domain_name) and (caller_ref.length > 0) and (ns_servers.count > 0) result = true @@ -206,7 +206,7 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do response.status == 200 } - tests("list resource records").formats(Aws::DNS::Formats::LIST_RESOURCE_RECORD_SETS) { + tests("list resource records").formats(AWS::DNS::Formats::LIST_RESOURCE_RECORD_SETS) { # get resource records for zone @r53_connection.list_resource_record_sets(@zone_id).body } diff --git a/tests/requests/dns/helper.rb b/tests/requests/dns/helper.rb index 458d38d36..96a5b33b5 100644 --- a/tests/requests/dns/helper.rb +++ b/tests/requests/dns/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module DNS module Formats RESOURCE_RECORD_SET = { diff --git a/tests/requests/elasticache/cache_cluster_tests.rb b/tests/requests/elasticache/cache_cluster_tests.rb index 9ead88af0..e6856abe4 100644 --- a/tests/requests/elasticache/cache_cluster_tests.rb +++ b/tests/requests/elasticache/cache_cluster_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Elasticache | cache cluster requests', ['aws', 'elasticache']) do +Shindo.tests('AWS::Elasticache | cache cluster requests', ['aws', 'elasticache']) do tests('success') do @@ -8,8 +8,8 @@ Shindo.tests('Aws::Elasticache | cache cluster requests', ['aws', 'elasticache'] tests( '#create_cache_cluster' - ).formats(Aws::Elasticache::Formats::SINGLE_CACHE_CLUSTER) do - body = Aws[:elasticache].create_cache_cluster(CLUSTER_ID, + ).formats(AWS::Elasticache::Formats::SINGLE_CACHE_CLUSTER) do + body = Fog::AWS[:elasticache].create_cache_cluster(CLUSTER_ID, :num_nodes => NUM_NODES ).body cluster = body['CacheCluster'] @@ -20,8 +20,8 @@ Shindo.tests('Aws::Elasticache | cache cluster requests', ['aws', 'elasticache'] tests( '#describe_cache_clusters without options' - ).formats(Aws::Elasticache::Formats::DESCRIBE_CACHE_CLUSTERS) do - body = Aws[:elasticache].describe_cache_clusters.body + ).formats(AWS::Elasticache::Formats::DESCRIBE_CACHE_CLUSTERS) do + body = Fog::AWS[:elasticache].describe_cache_clusters.body returns(true, "has #{CLUSTER_ID}") do body['CacheClusters'].any? do |cluster| cluster['CacheClusterId'] == CLUSTER_ID @@ -37,8 +37,8 @@ Shindo.tests('Aws::Elasticache | cache cluster requests', ['aws', 'elasticache'] tests( '#describe_cache_clusters with cluster ID' - ).formats(Aws::Elasticache::Formats::DESCRIBE_CACHE_CLUSTERS) do - body = Aws[:elasticache].describe_cache_clusters(CLUSTER_ID).body + ).formats(AWS::Elasticache::Formats::DESCRIBE_CACHE_CLUSTERS) do + body = Fog::AWS[:elasticache].describe_cache_clusters(CLUSTER_ID).body returns(1, "size of 1") { body['CacheClusters'].size } returns(CLUSTER_ID, "has #{CLUSTER_ID}") do body['CacheClusters'].first['CacheClusterId'] @@ -47,12 +47,12 @@ Shindo.tests('Aws::Elasticache | cache cluster requests', ['aws', 'elasticache'] end Formatador.display_line "Waiting for cluster #{CLUSTER_ID}..." - Aws[:elasticache].clusters.get(CLUSTER_ID).wait_for {ready?} + Fog::AWS[:elasticache].clusters.get(CLUSTER_ID).wait_for {ready?} tests( '#describe_cache_clusters with node info' - ).formats(Aws::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do - cluster = Aws[:elasticache].describe_cache_clusters(CLUSTER_ID, + ).formats(AWS::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do + cluster = Fog::AWS[:elasticache].describe_cache_clusters(CLUSTER_ID, :show_node_info => true ).body['CacheClusters'].first returns(NUM_NODES, "has #{NUM_NODES} nodes") do @@ -63,8 +63,8 @@ Shindo.tests('Aws::Elasticache | cache cluster requests', ['aws', 'elasticache'] tests( '#modify_cache_cluster - change a non-pending cluster attribute' - ).formats(Aws::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do - body = Aws[:elasticache].modify_cache_cluster(CLUSTER_ID, + ).formats(AWS::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do + body = Fog::AWS[:elasticache].modify_cache_cluster(CLUSTER_ID, :auto_minor_version_upgrade => false ).body # now check that parameter change is in place @@ -74,11 +74,11 @@ Shindo.tests('Aws::Elasticache | cache cluster requests', ['aws', 'elasticache'] tests( '#reboot_cache_cluster - reboot a node' - ).formats(Aws::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do - c = Aws[:elasticache].clusters.get(CLUSTER_ID) + ).formats(AWS::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do + c = Fog::AWS[:elasticache].clusters.get(CLUSTER_ID) node_id = c.nodes.last['CacheNodeId'] Formatador.display_line "Rebooting node #{node_id}..." - body = Aws[:elasticache].reboot_cache_cluster(c.id, [ node_id ]).body + body = Fog::AWS[:elasticache].reboot_cache_cluster(c.id, [ node_id ]).body returns('rebooting cache cluster nodes') do body['CacheCluster']['CacheClusterStatus'] end @@ -86,15 +86,15 @@ Shindo.tests('Aws::Elasticache | cache cluster requests', ['aws', 'elasticache'] end Formatador.display_line "Waiting for cluster #{CLUSTER_ID}..." - Aws[:elasticache].clusters.get(CLUSTER_ID).wait_for {ready?} + Fog::AWS[:elasticache].clusters.get(CLUSTER_ID).wait_for {ready?} tests( '#modify_cache_cluster - remove a node' - ).formats(Aws::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do - c = Aws[:elasticache].clusters.get(CLUSTER_ID) + ).formats(AWS::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do + c = Fog::AWS[:elasticache].clusters.get(CLUSTER_ID) node_id = c.nodes.last['CacheNodeId'] Formatador.display_line "Removing node #{node_id}..." - body = Aws[:elasticache].modify_cache_cluster(c.id, + body = Fog::AWS[:elasticache].modify_cache_cluster(c.id, { :num_nodes => NUM_NODES - 1, :nodes_to_remove => [node_id], @@ -107,12 +107,12 @@ Shindo.tests('Aws::Elasticache | cache cluster requests', ['aws', 'elasticache'] end Formatador.display_line "Waiting for cluster #{CLUSTER_ID}..." - Aws[:elasticache].clusters.get(CLUSTER_ID).wait_for {ready?} + Fog::AWS[:elasticache].clusters.get(CLUSTER_ID).wait_for {ready?} tests( '#delete_cache_clusters' - ).formats(Aws::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do - body = Aws[:elasticache].delete_cache_cluster(CLUSTER_ID).body + ).formats(AWS::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do + body = Fog::AWS[:elasticache].delete_cache_cluster(CLUSTER_ID).body # make sure this particular cluster is in the returned list returns(true, "has #{CLUSTER_ID}") do body['CacheClusters'].any? do |cluster| diff --git a/tests/requests/elasticache/describe_events.rb b/tests/requests/elasticache/describe_events.rb index c3e5e1041..0def2471d 100644 --- a/tests/requests/elasticache/describe_events.rb +++ b/tests/requests/elasticache/describe_events.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Elasticache | describe cache cluster events', +Shindo.tests('AWS::Elasticache | describe cache cluster events', ['aws', 'elasticache']) do tests('success') do @@ -6,8 +6,8 @@ Shindo.tests('Aws::Elasticache | describe cache cluster events', tests( '#describe_events' - ).formats(Aws::Elasticache::Formats::EVENT_LIST) do - Aws[:elasticache].describe_events().body['Events'] + ).formats(AWS::Elasticache::Formats::EVENT_LIST) do + Fog::AWS[:elasticache].describe_events().body['Events'] end end diff --git a/tests/requests/elasticache/describe_reserved_cache_nodes.rb b/tests/requests/elasticache/describe_reserved_cache_nodes.rb index 11795d2d6..9ec4fdcfd 100644 --- a/tests/requests/elasticache/describe_reserved_cache_nodes.rb +++ b/tests/requests/elasticache/describe_reserved_cache_nodes.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Elasticache | describe reserved cache nodes', +Shindo.tests('AWS::Elasticache | describe reserved cache nodes', ['aws', 'elasticache']) do tests('success') do @@ -6,8 +6,8 @@ Shindo.tests('Aws::Elasticache | describe reserved cache nodes', tests( '#describe_reserved_cache_nodes' - ).formats(Aws::Elasticache::Formats::RESERVED_CACHE_NODES) do - Aws[:elasticache].describe_reserved_cache_nodes().body['ReservedCacheNodes'] + ).formats(AWS::Elasticache::Formats::RESERVED_CACHE_NODES) do + Fog::AWS[:elasticache].describe_reserved_cache_nodes().body['ReservedCacheNodes'] end end diff --git a/tests/requests/elasticache/helper.rb b/tests/requests/elasticache/helper.rb index f0004914f..6858f13ef 100644 --- a/tests/requests/elasticache/helper.rb +++ b/tests/requests/elasticache/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module Elasticache module Formats BASIC = { diff --git a/tests/requests/elasticache/parameter_group_tests.rb b/tests/requests/elasticache/parameter_group_tests.rb index 5b337aa74..2d5033948 100644 --- a/tests/requests/elasticache/parameter_group_tests.rb +++ b/tests/requests/elasticache/parameter_group_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Elasticache | parameter group requests', ['aws', 'elasticache']) do +Shindo.tests('AWS::Elasticache | parameter group requests', ['aws', 'elasticache']) do tests('success') do pending if Fog.mocking? @@ -8,8 +8,8 @@ Shindo.tests('Aws::Elasticache | parameter group requests', ['aws', 'elasticache tests( '#describe_engine_default_parameters' - ).formats(Aws::Elasticache::Formats::ENGINE_DEFAULTS) do - response = Aws[:elasticache].describe_engine_default_parameters + ).formats(AWS::Elasticache::Formats::ENGINE_DEFAULTS) do + response = Fog::AWS[:elasticache].describe_engine_default_parameters engine_defaults = response.body['EngineDefaults'] returns('memcached1.4') { engine_defaults['CacheParameterGroupFamily'] } engine_defaults @@ -17,8 +17,8 @@ Shindo.tests('Aws::Elasticache | parameter group requests', ['aws', 'elasticache tests( '#create_cache_parameter_group' - ).formats(Aws::Elasticache::Formats::SINGLE_PARAMETER_GROUP) do - body = Aws[:elasticache].create_cache_parameter_group(name, description).body + ).formats(AWS::Elasticache::Formats::SINGLE_PARAMETER_GROUP) do + body = Fog::AWS[:elasticache].create_cache_parameter_group(name, description).body group = body['CacheParameterGroup'] returns(name) { group['CacheParameterGroupName'] } returns(description) { group['Description'] } @@ -28,16 +28,16 @@ Shindo.tests('Aws::Elasticache | parameter group requests', ['aws', 'elasticache tests( '#describe_cache_parameters' - ).formats(Aws::Elasticache::Formats::PARAMETER_SET) do - response = Aws[:elasticache].describe_cache_parameters(name) + ).formats(AWS::Elasticache::Formats::PARAMETER_SET) do + response = Fog::AWS[:elasticache].describe_cache_parameters(name) parameter_set = response.body['DescribeCacheParametersResult'] parameter_set end tests( '#describe_cache_parameter_groups without options' - ).formats(Aws::Elasticache::Formats::DESCRIBE_PARAMETER_GROUPS) do - body = Aws[:elasticache].describe_cache_parameter_groups.body + ).formats(AWS::Elasticache::Formats::DESCRIBE_PARAMETER_GROUPS) do + body = Fog::AWS[:elasticache].describe_cache_parameter_groups.body returns(true, "has #{name}") do body['CacheParameterGroups'].any? do |group| group['CacheParameterGroupName'] == name @@ -49,7 +49,7 @@ Shindo.tests('Aws::Elasticache | parameter group requests', ['aws', 'elasticache tests( '#reset_cache_parameter_group completely' ).formats('CacheParameterGroupName' => String) do - result = Aws[:elasticache].reset_cache_parameter_group( + result = Fog::AWS[:elasticache].reset_cache_parameter_group( name ).body['ResetCacheParameterGroupResult'] returns(name) {result['CacheParameterGroupName']} @@ -59,7 +59,7 @@ Shindo.tests('Aws::Elasticache | parameter group requests', ['aws', 'elasticache tests( '#modify_cache_parameter_group' ).formats('CacheParameterGroupName' => String) do - result = Aws[:elasticache].modify_cache_parameter_group( + result = Fog::AWS[:elasticache].modify_cache_parameter_group( name, {"chunk_size" => 32} ).body['ModifyCacheParameterGroupResult'] returns(name) {result['CacheParameterGroupName']} @@ -71,7 +71,7 @@ Shindo.tests('Aws::Elasticache | parameter group requests', ['aws', 'elasticache '#reset_cache_parameter_group with one parameter' ).formats('CacheParameterGroupName' => String) do pending - result = Aws[:elasticache].reset_cache_parameter_group( + result = Fog::AWS[:elasticache].reset_cache_parameter_group( name, ["chunk_size"] ).body['ResetCacheParameterGroupResult'] returns(name) {result['CacheParameterGroupName']} @@ -80,8 +80,8 @@ Shindo.tests('Aws::Elasticache | parameter group requests', ['aws', 'elasticache tests( '#describe_cache_parameter_groups with name' - ).formats(Aws::Elasticache::Formats::DESCRIBE_PARAMETER_GROUPS) do - body = Aws[:elasticache].describe_cache_parameter_groups(name).body + ).formats(AWS::Elasticache::Formats::DESCRIBE_PARAMETER_GROUPS) do + body = Fog::AWS[:elasticache].describe_cache_parameter_groups(name).body returns(1, "size of 1") { body['CacheParameterGroups'].size } returns(name, "has #{name}") do body['CacheParameterGroups'].first['CacheParameterGroupName'] @@ -91,8 +91,8 @@ Shindo.tests('Aws::Elasticache | parameter group requests', ['aws', 'elasticache tests( '#delete_cache_parameter_group' - ).formats(Aws::Elasticache::Formats::BASIC) do - body = Aws[:elasticache].delete_cache_parameter_group(name).body + ).formats(AWS::Elasticache::Formats::BASIC) do + body = Fog::AWS[:elasticache].delete_cache_parameter_group(name).body end end diff --git a/tests/requests/elasticache/security_group_tests.rb b/tests/requests/elasticache/security_group_tests.rb index cc28852a9..132c6d3c9 100644 --- a/tests/requests/elasticache/security_group_tests.rb +++ b/tests/requests/elasticache/security_group_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Elasticache | security group requests', ['aws', 'elasticache']) do +Shindo.tests('AWS::Elasticache | security group requests', ['aws', 'elasticache']) do tests('success') do @@ -7,8 +7,8 @@ Shindo.tests('Aws::Elasticache | security group requests', ['aws', 'elasticache' tests( '#create_cache_security_group' - ).formats(Aws::Elasticache::Formats::SINGLE_SECURITY_GROUP) do - body = Aws[:elasticache].create_cache_security_group(name, description).body + ).formats(AWS::Elasticache::Formats::SINGLE_SECURITY_GROUP) do + body = Fog::AWS[:elasticache].create_cache_security_group(name, description).body group = body['CacheSecurityGroup'] returns(name) { group['CacheSecurityGroupName'] } returns(description) { group['Description'] } @@ -18,8 +18,8 @@ Shindo.tests('Aws::Elasticache | security group requests', ['aws', 'elasticache' tests( '#describe_cache_security_groups without options' - ).formats(Aws::Elasticache::Formats::DESCRIBE_SECURITY_GROUPS) do - body = Aws[:elasticache].describe_cache_security_groups.body + ).formats(AWS::Elasticache::Formats::DESCRIBE_SECURITY_GROUPS) do + body = Fog::AWS[:elasticache].describe_cache_security_groups.body returns(true, "has #{name}") do body['CacheSecurityGroups'].any? do |group| group['CacheSecurityGroupName'] == name @@ -30,8 +30,8 @@ Shindo.tests('Aws::Elasticache | security group requests', ['aws', 'elasticache' tests( '#describe_cache_security_groups with name' - ).formats(Aws::Elasticache::Formats::DESCRIBE_SECURITY_GROUPS) do - body = Aws[:elasticache].describe_cache_security_groups(name).body + ).formats(AWS::Elasticache::Formats::DESCRIBE_SECURITY_GROUPS) do + body = Fog::AWS[:elasticache].describe_cache_security_groups(name).body returns(1, "size of 1") { body['CacheSecurityGroups'].size } returns(name, "has #{name}") do body['CacheSecurityGroups'].first['CacheSecurityGroupName'] @@ -40,7 +40,7 @@ Shindo.tests('Aws::Elasticache | security group requests', ['aws', 'elasticache' end tests('authorization') do - ec2_group = Fog::Compute.new(:provider => 'Aws').security_groups.create( + ec2_group = Fog::Compute.new(:provider => 'AWS').security_groups.create( :name => 'fog-test-elasticache', :description => 'Fog Test Elasticache' ) # Reload to get the owner_id @@ -48,8 +48,8 @@ Shindo.tests('Aws::Elasticache | security group requests', ['aws', 'elasticache' tests( '#authorize_cache_security_group_ingress' - ).formats(Aws::Elasticache::Formats::SINGLE_SECURITY_GROUP) do - body = Aws[:elasticache].authorize_cache_security_group_ingress( + ).formats(AWS::Elasticache::Formats::SINGLE_SECURITY_GROUP) do + body = Fog::AWS[:elasticache].authorize_cache_security_group_ingress( name, ec2_group.name, ec2_group.owner_id ).body group = body['CacheSecurityGroup'] @@ -65,17 +65,17 @@ Shindo.tests('Aws::Elasticache | security group requests', ['aws', 'elasticache' # Wait for the state to be active Fog.wait_for do - response = Aws[:elasticache].describe_cache_security_groups(name) + response = Fog::AWS[:elasticache].describe_cache_security_groups(name) group = response.body['CacheSecurityGroups'].first group['EC2SecurityGroups'].all? {|ec2| ec2['Status'] == 'authorized'} end tests( '#revoke_cache_security_group_ingress' - ).formats(Aws::Elasticache::Formats::SINGLE_SECURITY_GROUP) do + ).formats(AWS::Elasticache::Formats::SINGLE_SECURITY_GROUP) do pending if Fog.mocking? - body = Aws[:elasticache].revoke_cache_security_group_ingress( + body = Fog::AWS[:elasticache].revoke_cache_security_group_ingress( name, ec2_group.name, ec2_group.owner_id ).body group = body['CacheSecurityGroup'] @@ -94,8 +94,8 @@ Shindo.tests('Aws::Elasticache | security group requests', ['aws', 'elasticache' tests( '#delete_cache_security_group' - ).formats(Aws::Elasticache::Formats::BASIC) do - body = Aws[:elasticache].delete_cache_security_group(name).body + ).formats(AWS::Elasticache::Formats::BASIC) do + body = Fog::AWS[:elasticache].delete_cache_security_group(name).body end end diff --git a/tests/requests/elasticache/subnet_group_tests.rb b/tests/requests/elasticache/subnet_group_tests.rb index a37f4da56..6493f995c 100644 --- a/tests/requests/elasticache/subnet_group_tests.rb +++ b/tests/requests/elasticache/subnet_group_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Elasticache | subnet group requests', ['aws', 'elasticache']) do +Shindo.tests('AWS::Elasticache | subnet group requests', ['aws', 'elasticache']) do # random_differentiator # Useful when rapidly re-running tests, so we don't have to wait # serveral minutes for deleted VPCs/subnets to disappear @@ -23,7 +23,7 @@ Shindo.tests('Aws::Elasticache | subnet group requests', ['aws', 'elasticache']) subnet_ids = @subnets.map { |sn| sn['subnetId'] }.to_a - tests("#create_cache_subnet_group").formats(Aws::Elasticache::Formats::CREATE_CACHE_SUBNET_GROUP) do + tests("#create_cache_subnet_group").formats(AWS::Elasticache::Formats::CREATE_CACHE_SUBNET_GROUP) do result = Fog::AWS[:elasticache].create_cache_subnet_group(@subnet_group_name, subnet_ids, 'A subnet group').body returns(@subnet_group_name) { result['CreateCacheSubnetGroupResult']['CacheSubnetGroup']['CacheSubnetGroupName'] } @@ -34,11 +34,11 @@ Shindo.tests('Aws::Elasticache | subnet group requests', ['aws', 'elasticache']) result end - tests("#describe_cache_subnet_groups").formats(Aws::Elasticache::Formats::DESCRIBE_CACHE_SUBNET_GROUPS) do + tests("#describe_cache_subnet_groups").formats(AWS::Elasticache::Formats::DESCRIBE_CACHE_SUBNET_GROUPS) do Fog::AWS[:elasticache].describe_cache_subnet_groups.body end - tests("#delete_cache_subnet_group").formats(Aws::Elasticache::Formats::BASIC) do + tests("#delete_cache_subnet_group").formats(AWS::Elasticache::Formats::BASIC) do Fog::AWS[:elasticache].delete_cache_subnet_group(@subnet_group_name).body end diff --git a/tests/requests/elb/helper.rb b/tests/requests/elb/helper.rb index a38237a48..46f430cef 100644 --- a/tests/requests/elb/helper.rb +++ b/tests/requests/elb/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module ELB module Formats BASIC = { diff --git a/tests/requests/elb/listener_tests.rb b/tests/requests/elb/listener_tests.rb index 5203b68e8..c7b4e88b6 100644 --- a/tests/requests/elb/listener_tests.rb +++ b/tests/requests/elb/listener_tests.rb @@ -1,12 +1,12 @@ -Shindo.tests('Aws::ELB | listener_tests', ['aws', 'elb']) do +Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do @load_balancer_id = 'fog-test-listener' @key_name = 'fog-test' tests('success') do Fog::AWS[:elb].create_load_balancer(['us-east-1a'], @load_balancer_id, [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'HTTP'}]) - @certificate = Fog::AWS[:iam].upload_server_certificate(Aws::IAM::SERVER_CERT, Aws::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate'] + @certificate = Fog::AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate'] - tests("#create_load_balancer_listeners").formats(Aws::ELB::Formats::BASIC) do + tests("#create_load_balancer_listeners").formats(AWS::ELB::Formats::BASIC) do listeners = [ {'Protocol' => 'TCP', 'InstanceProtocol' => 'TCP', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']}, {'Protocol' => 'HTTP', 'InstanceProtocol' => 'HTTP', 'LoadBalancerPort' => 80, 'InstancePort' => 80} @@ -15,7 +15,7 @@ Shindo.tests('Aws::ELB | listener_tests', ['aws', 'elb']) do response end - tests("#delete_load_balancer_listeners").formats(Aws::ELB::Formats::BASIC) do + tests("#delete_load_balancer_listeners").formats(AWS::ELB::Formats::BASIC) do ports = [80, 443] Fog::AWS[:elb].delete_load_balancer_listeners(@load_balancer_id, ports).body end @@ -35,8 +35,8 @@ Shindo.tests('Aws::ELB | listener_tests', ['aws', 'elb']) do Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body end - # This is sort of fucked up, but it may or may not fail, thanks Aws - tests("#create_load_balancer_listeners with SSL certificate").formats(Aws::ELB::Formats::BASIC) do + # This is sort of fucked up, but it may or may not fail, thanks AWS + tests("#create_load_balancer_listeners with SSL certificate").formats(AWS::ELB::Formats::BASIC) do sleep 8 unless Fog.mocking? listeners = [ {'Protocol' => 'HTTPS', 'InstanceProtocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']}, @@ -44,7 +44,7 @@ Shindo.tests('Aws::ELB | listener_tests', ['aws', 'elb']) do Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body end - tests("#set_load_balancer_listener_ssl_certificate").formats(Aws::ELB::Formats::BASIC) do + tests("#set_load_balancer_listener_ssl_certificate").formats(AWS::ELB::Formats::BASIC) do Fog::AWS[:elb].set_load_balancer_listener_ssl_certificate(@load_balancer_id, 443, @certificate['Arn']).body end @@ -55,7 +55,7 @@ Shindo.tests('Aws::ELB | listener_tests', ['aws', 'elb']) do Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body end - tests("#create_load_balancer_listeners with valid Protocol and InstanceProtocol configuration").formats(Aws::ELB::Formats::BASIC) do + tests("#create_load_balancer_listeners with valid Protocol and InstanceProtocol configuration").formats(AWS::ELB::Formats::BASIC) do listeners = [ {'Protocol' => 'HTTP', 'InstanceProtocol' => 'HTTPS', 'LoadBalancerPort' => 80, 'InstancePort' => 80}, ] diff --git a/tests/requests/elb/load_balancer_tests.rb b/tests/requests/elb/load_balancer_tests.rb index 3f86f915b..66d64c7d6 100644 --- a/tests/requests/elb/load_balancer_tests.rb +++ b/tests/requests/elb/load_balancer_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::ELB | load_balancer_tests', ['aws', 'elb']) do +Shindo.tests('AWS::ELB | load_balancer_tests', ['aws', 'elb']) do @load_balancer_id = 'fog-test-elb' @key_name = 'fog-test' @@ -7,15 +7,15 @@ Shindo.tests('Aws::ELB | load_balancer_tests', ['aws', 'elb']) do Fog::AWS[:iam].delete_server_certificate(@key_name) end - @certificate = Fog::AWS[:iam].upload_server_certificate(Aws::IAM::SERVER_CERT, Aws::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate'] + @certificate = Fog::AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate'] - tests("#create_load_balancer").formats(Aws::ELB::Formats::CREATE_LOAD_BALANCER) do + tests("#create_load_balancer").formats(AWS::ELB::Formats::CREATE_LOAD_BALANCER) do zones = ['us-east-1a'] listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'InstanceProtocol' => 'HTTP', 'Protocol' => 'HTTP'}] Fog::AWS[:elb].create_load_balancer(zones, @load_balancer_id, listeners).body end - tests("#describe_load_balancers").formats(Aws::ELB::Formats::DESCRIBE_LOAD_BALANCERS) do + tests("#describe_load_balancers").formats(AWS::ELB::Formats::DESCRIBE_LOAD_BALANCERS) do Fog::AWS[:elb].describe_load_balancers.body end @@ -60,7 +60,7 @@ Shindo.tests('Aws::ELB | load_balancer_tests', ['aws', 'elb']) do end end - tests("#configure_health_check").formats(Aws::ELB::Formats::CONFIGURE_HEALTH_CHECK) do + tests("#configure_health_check").formats(AWS::ELB::Formats::CONFIGURE_HEALTH_CHECK) do health_check = { 'Target' => 'HTTP:80/index.html', 'Interval' => 10, @@ -72,15 +72,15 @@ Shindo.tests('Aws::ELB | load_balancer_tests', ['aws', 'elb']) do Fog::AWS[:elb].configure_health_check(@load_balancer_id, health_check).body end - tests("#delete_load_balancer").formats(Aws::ELB::Formats::DELETE_LOAD_BALANCER) do + tests("#delete_load_balancer").formats(AWS::ELB::Formats::DELETE_LOAD_BALANCER) do Fog::AWS[:elb].delete_load_balancer(@load_balancer_id).body end - tests("#delete_load_balancer when non existant").formats(Aws::ELB::Formats::DELETE_LOAD_BALANCER) do + tests("#delete_load_balancer when non existant").formats(AWS::ELB::Formats::DELETE_LOAD_BALANCER) do Fog::AWS[:elb].delete_load_balancer('non-existant').body end - tests("#delete_load_balancer when already deleted").formats(Aws::ELB::Formats::DELETE_LOAD_BALANCER) do + tests("#delete_load_balancer when already deleted").formats(AWS::ELB::Formats::DELETE_LOAD_BALANCER) do Fog::AWS[:elb].delete_load_balancer(@load_balancer_id).body end diff --git a/tests/requests/elb/policy_tests.rb b/tests/requests/elb/policy_tests.rb index fda4663fd..fd4a5f19c 100644 --- a/tests/requests/elb/policy_tests.rb +++ b/tests/requests/elb/policy_tests.rb @@ -1,38 +1,38 @@ -Shindo.tests('Aws::ELB | policy_tests', ['aws', 'elb']) do +Shindo.tests('AWS::ELB | policy_tests', ['aws', 'elb']) do @load_balancer_id = 'fog-test-policies' tests('success') do listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'HTTP'}] Fog::AWS[:elb].create_load_balancer(['us-east-1a'], @load_balancer_id, listeners) - tests("#describe_load_balancer_policy_types").formats(Aws::ELB::Formats::DESCRIBE_LOAD_BALANCER_POLICY_TYPES) do + tests("#describe_load_balancer_policy_types").formats(AWS::ELB::Formats::DESCRIBE_LOAD_BALANCER_POLICY_TYPES) do @policy_types = Fog::AWS[:elb].describe_load_balancer_policy_types.body end - tests("#create_app_cookie_stickiness_policy").formats(Aws::ELB::Formats::BASIC) do + tests("#create_app_cookie_stickiness_policy").formats(AWS::ELB::Formats::BASIC) do cookie, policy = 'fog-app-cookie', 'fog-app-policy' Fog::AWS[:elb].create_app_cookie_stickiness_policy(@load_balancer_id, policy, cookie).body end - tests("#create_lb_cookie_stickiness_policy with expiry").formats(Aws::ELB::Formats::BASIC) do + tests("#create_lb_cookie_stickiness_policy with expiry").formats(AWS::ELB::Formats::BASIC) do policy = 'fog-lb-expiry' expiry = 300 Fog::AWS[:elb].create_lb_cookie_stickiness_policy(@load_balancer_id, policy, expiry).body end - tests("#create_lb_cookie_stickiness_policy without expiry").formats(Aws::ELB::Formats::BASIC) do + tests("#create_lb_cookie_stickiness_policy without expiry").formats(AWS::ELB::Formats::BASIC) do policy = 'fog-lb-no-expiry' Fog::AWS[:elb].create_lb_cookie_stickiness_policy(@load_balancer_id, policy).body end - tests("#create_load_balancer_policy").formats(Aws::ELB::Formats::BASIC) do + tests("#create_load_balancer_policy").formats(AWS::ELB::Formats::BASIC) do policy = 'fog-policy' - Fog::AWS[:elb].create_load_balancer_policy(@load_balancer_id, policy, 'PublicKeyPolicyType', {'PublicKey' => Aws::IAM::SERVER_CERT_PUBLIC_KEY}).body + Fog::AWS[:elb].create_load_balancer_policy(@load_balancer_id, policy, 'PublicKeyPolicyType', {'PublicKey' => AWS::IAM::SERVER_CERT_PUBLIC_KEY}).body end tests("#describe_load_balancer_policies") do body = Fog::AWS[:elb].describe_load_balancer_policies(@load_balancer_id).body - formats(Aws::ELB::Formats::DESCRIBE_LOAD_BALANCER_POLICIES) { body } + formats(AWS::ELB::Formats::DESCRIBE_LOAD_BALANCER_POLICIES) { body } # Check the result of each policy by name returns({ @@ -71,7 +71,7 @@ Shindo.tests('Aws::ELB | policy_tests', ['aws', 'elb']) do returns({ "PolicyAttributeDescriptions"=>[{ "AttributeName"=>"PublicKey", - "AttributeValue"=> Aws::IAM::SERVER_CERT_PUBLIC_KEY + "AttributeValue"=> AWS::IAM::SERVER_CERT_PUBLIC_KEY }], "PolicyName"=>"fog-policy", "PolicyTypeName"=>"PublicKeyPolicyType" @@ -99,17 +99,17 @@ Shindo.tests('Aws::ELB | policy_tests', ['aws', 'elb']) do ]) { lb["Policies"]["OtherPolicies"] } end - tests("#delete_load_balancer_policy").formats(Aws::ELB::Formats::BASIC) do + tests("#delete_load_balancer_policy").formats(AWS::ELB::Formats::BASIC) do policy = 'fog-lb-no-expiry' Fog::AWS[:elb].delete_load_balancer_policy(@load_balancer_id, policy).body end - tests("#set_load_balancer_policies_of_listener adds policy").formats(Aws::ELB::Formats::BASIC) do + tests("#set_load_balancer_policies_of_listener adds policy").formats(AWS::ELB::Formats::BASIC) do port, policies = 80, ['fog-lb-expiry'] Fog::AWS[:elb].set_load_balancer_policies_of_listener(@load_balancer_id, port, policies).body end - tests("#set_load_balancer_policies_of_listener removes policy").formats(Aws::ELB::Formats::BASIC) do + tests("#set_load_balancer_policies_of_listener removes policy").formats(AWS::ELB::Formats::BASIC) do port = 80 Fog::AWS[:elb].set_load_balancer_policies_of_listener(@load_balancer_id, port, []).body end @@ -117,7 +117,7 @@ Shindo.tests('Aws::ELB | policy_tests', ['aws', 'elb']) do proxy_policy = "EnableProxyProtocol" Fog::AWS[:elb].create_load_balancer_policy(@load_balancer_id, proxy_policy, 'ProxyProtocolPolicyType', { "ProxyProtocol" => true }) - tests("#set_load_balancer_policies_for_backend_server replaces policies on port").formats(Aws::ELB::Formats::BASIC) do + tests("#set_load_balancer_policies_for_backend_server replaces policies on port").formats(AWS::ELB::Formats::BASIC) do Fog::AWS[:elb].set_load_balancer_policies_for_backend_server(@load_balancer_id, 80, [proxy_policy]).body end diff --git a/tests/requests/emr/helper.rb b/tests/requests/emr/helper.rb index 74e798907..6d4cb761b 100644 --- a/tests/requests/emr/helper.rb +++ b/tests/requests/emr/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module EMR module Formats BASIC = { diff --git a/tests/requests/emr/instance_group_tests.rb b/tests/requests/emr/instance_group_tests.rb index 2ed99b195..f34d03769 100644 --- a/tests/requests/emr/instance_group_tests.rb +++ b/tests/requests/emr/instance_group_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::EMR | instance groups', ['aws', 'emr']) do +Shindo.tests('AWS::EMR | instance groups', ['aws', 'emr']) do pending if Fog.mocking? @@ -40,51 +40,51 @@ Shindo.tests('Aws::EMR | instance groups', ['aws', 'emr']) do }] } - result = Aws[:emr].run_job_flow(@job_flow_name, @job_flow_options).body + result = Fog::AWS[:emr].run_job_flow(@job_flow_name, @job_flow_options).body @job_flow_id = result['JobFlowId'] tests('success') do - tests("#add_instance_groups").formats(Aws::EMR::Formats::ADD_INSTANCE_GROUPS) do + tests("#add_instance_groups").formats(AWS::EMR::Formats::ADD_INSTANCE_GROUPS) do pending if Fog.mocking? - result = Aws[:emr].add_instance_groups(@job_flow_id, @instance_groups).body + result = Fog::AWS[:emr].add_instance_groups(@job_flow_id, @instance_groups).body @instance_group_id = result['InstanceGroupIds'].first result end - tests("#describe_job_flows_with_instance_groups").formats(Aws::EMR::Formats::DESCRIBE_JOB_FLOW_WITH_INSTANCE_GROUPS) do + tests("#describe_job_flows_with_instance_groups").formats(AWS::EMR::Formats::DESCRIBE_JOB_FLOW_WITH_INSTANCE_GROUPS) do pending if Fog.mocking? - result = Aws[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body + result = Fog::AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body result end - tests("#modify_instance_groups").formats(Aws::EMR::Formats::BASIC) do + tests("#modify_instance_groups").formats(AWS::EMR::Formats::BASIC) do pending if Fog.mocking? # Add a step so the state doesn't go directly from STARTING to SHUTTING_DOWN - Aws[:emr].add_job_flow_steps(@job_flow_id, @job_flow_steps) + Fog::AWS[:emr].add_job_flow_steps(@job_flow_id, @job_flow_steps) # Wait until job has started before modifying the instance group begin sleep 10 - result = Aws[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body + result = Fog::AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body job_flow = result['JobFlows'].first state = job_flow['ExecutionStatusDetail']['State'] print "." end while(state == 'STARTING') # Check results - result = Aws[:emr].modify_instance_groups('InstanceGroups' => [{'InstanceGroupId' => @instance_group_id, 'InstanceCount' => 4}]).body + result = Fog::AWS[:emr].modify_instance_groups('InstanceGroups' => [{'InstanceGroupId' => @instance_group_id, 'InstanceCount' => 4}]).body # Check the it actually modified the instance count tests("modify worked?") do - ig_res = Aws[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body + ig_res = Fog::AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body matched = false jf = ig_res['JobFlows'].first @@ -102,5 +102,5 @@ Shindo.tests('Aws::EMR | instance groups', ['aws', 'emr']) do end - Aws[:emr].terminate_job_flows('JobFlowIds' => [@job_flow_id]) + Fog::AWS[:emr].terminate_job_flows('JobFlowIds' => [@job_flow_id]) end diff --git a/tests/requests/emr/job_flow_tests.rb b/tests/requests/emr/job_flow_tests.rb index 4089e8cba..4b8993d0a 100644 --- a/tests/requests/emr/job_flow_tests.rb +++ b/tests/requests/emr/job_flow_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::EMR | job flows', ['aws', 'emr']) do +Shindo.tests('AWS::EMR | job flows', ['aws', 'emr']) do pending if Fog.mocking? @@ -36,29 +36,29 @@ Shindo.tests('Aws::EMR | job flows', ['aws', 'emr']) do tests('success') do - tests("#run_job_flow").formats(Aws::EMR::Formats::RUN_JOB_FLOW) do + tests("#run_job_flow").formats(AWS::EMR::Formats::RUN_JOB_FLOW) do pending if Fog.mocking? - result = Aws[:emr].run_job_flow(@job_flow_name, @job_flow_options).body + result = Fog::AWS[:emr].run_job_flow(@job_flow_name, @job_flow_options).body @job_flow_id = result['JobFlowId'] result end - tests("#add_job_flow_steps").formats(Aws::EMR::Formats::BASIC) do + tests("#add_job_flow_steps").formats(AWS::EMR::Formats::BASIC) do pending if Fog.mocking? - result = Aws[:emr].add_job_flow_steps(@job_flow_id, @job_flow_steps).body + result = Fog::AWS[:emr].add_job_flow_steps(@job_flow_id, @job_flow_steps).body result end - tests("#set_termination_protection").formats(Aws::EMR::Formats::BASIC) do + tests("#set_termination_protection").formats(AWS::EMR::Formats::BASIC) do - result = Aws[:emr].set_termination_protection(true, 'JobFlowIds' => [@job_flow_id]).body + result = Fog::AWS[:emr].set_termination_protection(true, 'JobFlowIds' => [@job_flow_id]).body test("protected?") do - res = Aws[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body + res = Fog::AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body jf = res['JobFlows'].first jf['Instances']['TerminationProtected'] == 'true' @@ -67,19 +67,19 @@ Shindo.tests('Aws::EMR | job flows', ['aws', 'emr']) do result end - tests("#terminate_job_flow").formats(Aws::EMR::Formats::BASIC) do + tests("#terminate_job_flow").formats(AWS::EMR::Formats::BASIC) do pending if Fog.mocking? - Aws[:emr].set_termination_protection(false, 'JobFlowIds' => [@job_flow_id]) + Fog::AWS[:emr].set_termination_protection(false, 'JobFlowIds' => [@job_flow_id]) - result = Aws[:emr].terminate_job_flows('JobFlowIds' => [@job_flow_id]).body + result = Fog::AWS[:emr].terminate_job_flows('JobFlowIds' => [@job_flow_id]).body result end - tests("#describe_job_flows").formats(Aws::EMR::Formats::SIMPLE_DESCRIBE_JOB_FLOW) do + tests("#describe_job_flows").formats(AWS::EMR::Formats::SIMPLE_DESCRIBE_JOB_FLOW) do pending if Fog.mocking? - result = Aws[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body + result = Fog::AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body result end diff --git a/tests/requests/glacier/archive_tests.rb b/tests/requests/glacier/archive_tests.rb index ea4fc59b0..859fc71c6 100644 --- a/tests/requests/glacier/archive_tests.rb +++ b/tests/requests/glacier/archive_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Glacier | glacier archive tests', ['aws']) do +Shindo.tests('AWS::Glacier | glacier archive tests', ['aws']) do pending if Fog.mocking? Fog::AWS[:glacier].create_vault('Fog-Test-Vault-upload') diff --git a/tests/requests/glacier/multipart_upload_tests.rb b/tests/requests/glacier/multipart_upload_tests.rb index 88456675e..0816013b3 100644 --- a/tests/requests/glacier/multipart_upload_tests.rb +++ b/tests/requests/glacier/multipart_upload_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Glacier | glacier archive tests', ['aws']) do +Shindo.tests('AWS::Glacier | glacier archive tests', ['aws']) do pending if Fog.mocking? Fog::AWS[:glacier].create_vault('Fog-Test-Vault-upload') diff --git a/tests/requests/glacier/tree_hash_tests.rb b/tests/requests/glacier/tree_hash_tests.rb index 6c062ec48..fa6aa4d0f 100644 --- a/tests/requests/glacier/tree_hash_tests.rb +++ b/tests/requests/glacier/tree_hash_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Glacier | glacier tree hash calcuation', ['aws']) do +Shindo.tests('AWS::Glacier | glacier tree hash calcuation', ['aws']) do tests('tree_hash(single part < 1MB)') do returns(Digest::SHA256.hexdigest('')) { Fog::AWS::Glacier::TreeHash.digest('')} diff --git a/tests/requests/glacier/vault_tests.rb b/tests/requests/glacier/vault_tests.rb index 63373bbc6..690751696 100644 --- a/tests/requests/glacier/vault_tests.rb +++ b/tests/requests/glacier/vault_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Glacier | glacier vault requests', ['aws']) do +Shindo.tests('AWS::Glacier | glacier vault requests', ['aws']) do pending if Fog.mocking? topic_arn = Fog::AWS[:sns].create_topic( 'fog_test_glacier_topic').body['TopicArn'] diff --git a/tests/requests/iam/access_key_tests.rb b/tests/requests/iam/access_key_tests.rb index 0e388aa4d..d6d4afff8 100644 --- a/tests/requests/iam/access_key_tests.rb +++ b/tests/requests/iam/access_key_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::IAM | access key requests', ['aws']) do +Shindo.tests('AWS::IAM | access key requests', ['aws']) do Fog::AWS[:iam].create_user('fog_access_key_tests') @@ -33,12 +33,12 @@ Shindo.tests('Aws::IAM | access key requests', ['aws']) do Fog::AWS[:iam].list_access_keys('UserName' => 'fog_access_key_tests').body end - tests("#update_access_key('#{@access_key_id}', 'Inactive', 'UserName' => 'fog_access_key_tests')").formats(Aws::IAM::Formats::BASIC) do + tests("#update_access_key('#{@access_key_id}', 'Inactive', 'UserName' => 'fog_access_key_tests')").formats(AWS::IAM::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:iam].update_access_key(@access_key_id, 'Inactive', 'UserName' => 'fog_access_key_tests').body end - tests("#delete_access_key('#{@access_key_id}', 'UserName' => 'fog_access_key_tests)").formats(Aws::IAM::Formats::BASIC) do + tests("#delete_access_key('#{@access_key_id}', 'UserName' => 'fog_access_key_tests)").formats(AWS::IAM::Formats::BASIC) do Fog::AWS[:iam].delete_access_key(@access_key_id, 'UserName' => 'fog_access_key_tests').body end diff --git a/tests/requests/iam/account_policy_tests.rb b/tests/requests/iam/account_policy_tests.rb index 3c7ece379..7f10dc9fd 100644 --- a/tests/requests/iam/account_policy_tests.rb +++ b/tests/requests/iam/account_policy_tests.rb @@ -1,7 +1,7 @@ -Shindo.tests('Aws::IAM | account policy requests', ['aws']) do +Shindo.tests('AWS::IAM | account policy requests', ['aws']) do tests('success') do - tests("#update_account_password_policy(minimum_password_length, max_password_age, password_reuse_prevention,require_symbols,require_numbers,require_uppercase_characters, require_lowercase_characters,allow_users_to_change_password, hard_expiry, expire_passwords)").formats(Aws::IAM::Formats::BASIC) do + tests("#update_account_password_policy(minimum_password_length, max_password_age, password_reuse_prevention,require_symbols,require_numbers,require_uppercase_characters, require_lowercase_characters,allow_users_to_change_password, hard_expiry, expire_passwords)").formats(AWS::IAM::Formats::BASIC) do minimum_password_length, password_reuse_prevention, max_password_age = 5 require_symbols, require_numbers, require_uppercase_characters, require_lowercase_characters, allow_users_to_change_password, hard_expiry, expire_passwords = false @@ -12,7 +12,7 @@ Shindo.tests('Aws::IAM | account policy requests', ['aws']) do Fog::AWS[:iam].get_account_password_policy().body['AccountPasswordPolicy'] end - tests("#delete_account_password_policy()").formats(Aws::IAM::Formats::BASIC) do + tests("#delete_account_password_policy()").formats(AWS::IAM::Formats::BASIC) do Fog::AWS[:iam].delete_account_password_policy().body end diff --git a/tests/requests/iam/account_tests.rb b/tests/requests/iam/account_tests.rb index 7e55656bc..6cad2e7a4 100644 --- a/tests/requests/iam/account_tests.rb +++ b/tests/requests/iam/account_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::IAM | account requests', ['aws']) do +Shindo.tests('AWS::IAM | account requests', ['aws']) do tests('success') do @get_account_summary_format = { 'Summary' => { diff --git a/tests/requests/iam/group_policy_tests.rb b/tests/requests/iam/group_policy_tests.rb index ed808c710..1d4a63cee 100644 --- a/tests/requests/iam/group_policy_tests.rb +++ b/tests/requests/iam/group_policy_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::IAM | group policy requests', ['aws']) do +Shindo.tests('AWS::IAM | group policy requests', ['aws']) do Fog::AWS[:iam].create_group('fog_group_policy_tests') @@ -6,7 +6,7 @@ Shindo.tests('Aws::IAM | group policy requests', ['aws']) do @policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]} - tests("#put_group_policy('fog_group_policy_tests', 'fog_policy', #{@policy.inspect})").formats(Aws::IAM::Formats::BASIC) do + tests("#put_group_policy('fog_group_policy_tests', 'fog_policy', #{@policy.inspect})").formats(AWS::IAM::Formats::BASIC) do Fog::AWS[:iam].put_group_policy('fog_group_policy_tests', 'fog_policy', @policy).body end @@ -31,7 +31,7 @@ Shindo.tests('Aws::IAM | group policy requests', ['aws']) do Fog::AWS[:iam].get_group_policy('fog_policy', 'fog_group_policy_tests').body['Policy'] end - tests("#delete_group_policy('fog_group_policy_tests', 'fog_policy')").formats(Aws::IAM::Formats::BASIC) do + tests("#delete_group_policy('fog_group_policy_tests', 'fog_policy')").formats(AWS::IAM::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:iam].delete_group_policy('fog_group_policy_tests', 'fog_policy').body end diff --git a/tests/requests/iam/group_tests.rb b/tests/requests/iam/group_tests.rb index 08dd22845..ee4f9520c 100644 --- a/tests/requests/iam/group_tests.rb +++ b/tests/requests/iam/group_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::IAM | group requests', ['aws']) do +Shindo.tests('AWS::IAM | group requests', ['aws']) do tests('success') do @@ -31,7 +31,7 @@ Shindo.tests('Aws::IAM | group requests', ['aws']) do Fog::AWS[:iam].list_groups.body end - tests("#delete_group('fog_group')").formats(Aws::IAM::Formats::BASIC) do + tests("#delete_group('fog_group')").formats(AWS::IAM::Formats::BASIC) do Fog::AWS[:iam].delete_group('fog_group').body end diff --git a/tests/requests/iam/helper.rb b/tests/requests/iam/helper.rb index 9a61798eb..f160cabcb 100644 --- a/tests/requests/iam/helper.rb +++ b/tests/requests/iam/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module IAM # A self-signed test keypair. Generated using the command: # openssl req -new -newkey rsa:1024 -days 3650 -nodes -x509 -keyout server-private.key -out server-public.crt diff --git a/tests/requests/iam/login_profile_tests.rb b/tests/requests/iam/login_profile_tests.rb index c6b0f6185..7d1f37f23 100644 --- a/tests/requests/iam/login_profile_tests.rb +++ b/tests/requests/iam/login_profile_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::IAM | user requests', ['aws']) do +Shindo.tests('AWS::IAM | user requests', ['aws']) do unless Fog.mocking? Fog::AWS[:iam].create_user('fog_user') @@ -26,7 +26,7 @@ Shindo.tests('Aws::IAM | user requests', ['aws']) do result end - tests("#update_login_profile('fog_user')").formats(Aws::IAM::Formats::BASIC) do + tests("#update_login_profile('fog_user')").formats(AWS::IAM::Formats::BASIC) do pending if Fog.mocking? begin Fog::AWS[:iam].update_login_profile('fog_user', 'otherpassword').body @@ -36,7 +36,7 @@ Shindo.tests('Aws::IAM | user requests', ['aws']) do end end - tests("#delete_login_profile('fog_user')").formats(Aws::IAM::Formats::BASIC) do + tests("#delete_login_profile('fog_user')").formats(AWS::IAM::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:iam].delete_login_profile('fog_user').body end diff --git a/tests/requests/iam/mfa_tests.rb b/tests/requests/iam/mfa_tests.rb index 65a86d06f..7cd838d62 100644 --- a/tests/requests/iam/mfa_tests.rb +++ b/tests/requests/iam/mfa_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::IAM | mfa requests', ['aws']) do +Shindo.tests('AWS::IAM | mfa requests', ['aws']) do tests('success') do @mfa_devices_format = { diff --git a/tests/requests/iam/role_tests.rb b/tests/requests/iam/role_tests.rb index 0f55937e3..0c62531a1 100644 --- a/tests/requests/iam/role_tests.rb +++ b/tests/requests/iam/role_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::IAM | role requests', ['aws']) do +Shindo.tests('AWS::IAM | role requests', ['aws']) do tests('success') do @role = { @@ -65,7 +65,7 @@ Shindo.tests('Aws::IAM | role requests', ['aws']) do Fog::AWS[:iam].get_instance_profile('fogprofile').body end - tests("#add_role_to_instance_profile('fogprofile','fogrole')").formats(Aws::IAM::Formats::BASIC) do + tests("#add_role_to_instance_profile('fogprofile','fogrole')").formats(AWS::IAM::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:iam].add_role_to_instance_profile('fogrole', 'fogprofile').body end @@ -97,7 +97,7 @@ Shindo.tests('Aws::IAM | role requests', ['aws']) do sample_policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]} - tests("put_role_policy").formats(Aws::IAM::Formats::BASIC) do + tests("put_role_policy").formats(AWS::IAM::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:iam].put_role_policy('fogrole', 'fogpolicy', sample_policy).body end @@ -133,7 +133,7 @@ Shindo.tests('Aws::IAM | role requests', ['aws']) do body end - tests("delete_role_policy").formats(Aws::IAM::Formats::BASIC) do + tests("delete_role_policy").formats(AWS::IAM::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:iam].delete_role_policy('fogrole', 'fogpolicy').body end @@ -143,7 +143,7 @@ Shindo.tests('Aws::IAM | role requests', ['aws']) do Fog::AWS[:iam].list_role_policies('fogrole').body['PolicyNames'] end - tests("remove_role_from_instance_profile").formats(Aws::IAM::Formats::BASIC) do + tests("remove_role_from_instance_profile").formats(AWS::IAM::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:iam].remove_role_from_instance_profile('fogrole', 'fogprofile').body end @@ -153,12 +153,12 @@ Shindo.tests('Aws::IAM | role requests', ['aws']) do Fog::AWS[:iam].list_instance_profiles_for_role('fogrole').body['InstanceProfiles'] end - tests("#delete_instance_profile('fogprofile'").formats(Aws::IAM::Formats::BASIC) do + tests("#delete_instance_profile('fogprofile'").formats(AWS::IAM::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:iam].delete_instance_profile('fogprofile').body end - tests("#delete_role('fogrole'").formats(Aws::IAM::Formats::BASIC) do + tests("#delete_role('fogrole'").formats(AWS::IAM::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:iam].delete_role('fogrole').body end diff --git a/tests/requests/iam/server_certificate_tests.rb b/tests/requests/iam/server_certificate_tests.rb index 8a880607f..ea7c14282 100644 --- a/tests/requests/iam/server_certificate_tests.rb +++ b/tests/requests/iam/server_certificate_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::IAM | server certificate requests', ['aws']) do +Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do @key_name = 'fog-test' @key_name_chained = 'fog-test-chained' @@ -25,10 +25,10 @@ Shindo.tests('Aws::IAM | server certificate requests', ['aws']) do } tests('#upload_server_certificate') do - public_key = Aws::IAM::SERVER_CERT - private_key = Aws::IAM::SERVER_CERT_PRIVATE_KEY - private_key_pkcs8 = Aws::IAM::SERVER_CERT_PRIVATE_KEY_PKCS8 - private_key_mismatch = Aws::IAM::SERVER_CERT_PRIVATE_KEY_MISMATCHED + public_key = AWS::IAM::SERVER_CERT + private_key = AWS::IAM::SERVER_CERT_PRIVATE_KEY + private_key_pkcs8 = AWS::IAM::SERVER_CERT_PRIVATE_KEY_PKCS8 + private_key_mismatch = AWS::IAM::SERVER_CERT_PRIVATE_KEY_MISMATCHED tests('empty public key').raises(Fog::AWS::IAM::ValidationError) do Fog::AWS::IAM.new.upload_server_certificate('', private_key, @key_name) @@ -68,8 +68,8 @@ Shindo.tests('Aws::IAM | server certificate requests', ['aws']) do end tests('#update_server_certificate') do - public_key = Aws::IAM::SERVER_CERT - private_key = Aws::IAM::SERVER_CERT_PRIVATE_KEY + public_key = AWS::IAM::SERVER_CERT + private_key = AWS::IAM::SERVER_CERT_PRIVATE_KEY key_name = "update-key" Fog::AWS::IAM.new.upload_server_certificate(public_key, private_key, key_name) @@ -119,7 +119,7 @@ Shindo.tests('Aws::IAM | server certificate requests', ['aws']) do result end - tests('#delete_server_certificate').formats(Aws::IAM::Formats::BASIC) do + tests('#delete_server_certificate').formats(AWS::IAM::Formats::BASIC) do tests('raises NotFound').raises(Fog::AWS::IAM::NotFound) do Fog::AWS::IAM.new.delete_server_certificate("#{@key_name}fake") end diff --git a/tests/requests/iam/user_policy_tests.rb b/tests/requests/iam/user_policy_tests.rb index 901465e13..76bdfb704 100644 --- a/tests/requests/iam/user_policy_tests.rb +++ b/tests/requests/iam/user_policy_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::IAM | user policy requests', ['aws']) do +Shindo.tests('AWS::IAM | user policy requests', ['aws']) do Fog::AWS[:iam].create_user('fog_user_policy_tests') @@ -6,7 +6,7 @@ Shindo.tests('Aws::IAM | user policy requests', ['aws']) do @policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]} - tests("#put_user_policy('fog_user_policy_tests', 'fog_policy', #{@policy.inspect})").formats(Aws::IAM::Formats::BASIC) do + tests("#put_user_policy('fog_user_policy_tests', 'fog_policy', #{@policy.inspect})").formats(AWS::IAM::Formats::BASIC) do Fog::AWS[:iam].put_user_policy('fog_user_policy_tests', 'fog_policy', @policy).body end @@ -30,7 +30,7 @@ Shindo.tests('Aws::IAM | user policy requests', ['aws']) do Fog::AWS[:iam].get_user_policy('fog_policy', 'fog_user_policy_tests').body['Policy'] end - tests("#delete_user_policy('fog_user_policy_tests', 'fog_policy')").formats(Aws::IAM::Formats::BASIC) do + tests("#delete_user_policy('fog_user_policy_tests', 'fog_policy')").formats(AWS::IAM::Formats::BASIC) do Fog::AWS[:iam].delete_user_policy('fog_user_policy_tests', 'fog_policy').body end diff --git a/tests/requests/iam/user_tests.rb b/tests/requests/iam/user_tests.rb index b894264de..700980886 100644 --- a/tests/requests/iam/user_tests.rb +++ b/tests/requests/iam/user_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::IAM | user requests', ['aws']) do +Shindo.tests('AWS::IAM | user requests', ['aws']) do Fog::AWS[:iam].create_group('fog_user_tests') @@ -39,7 +39,7 @@ Shindo.tests('Aws::IAM | user requests', ['aws']) do Fog::AWS[:iam].get_user('fog_user').body end - tests("#add_user_to_group('fog_user_tests', 'fog_user')").formats(Aws::IAM::Formats::BASIC) do + tests("#add_user_to_group('fog_user_tests', 'fog_user')").formats(AWS::IAM::Formats::BASIC) do Fog::AWS[:iam].add_user_to_group('fog_user_tests', 'fog_user').body end @@ -58,11 +58,11 @@ Shindo.tests('Aws::IAM | user requests', ['aws']) do Fog::AWS[:iam].list_groups_for_user('fog_user').body end - tests("#remove_user_from_group('fog_user_tests', 'fog_user')").formats(Aws::IAM::Formats::BASIC) do + tests("#remove_user_from_group('fog_user_tests', 'fog_user')").formats(AWS::IAM::Formats::BASIC) do Fog::AWS[:iam].remove_user_from_group('fog_user_tests', 'fog_user').body end - tests("#delete_user('fog_user')").formats(Aws::IAM::Formats::BASIC) do + tests("#delete_user('fog_user')").formats(AWS::IAM::Formats::BASIC) do Fog::AWS[:iam].delete_user('fog_user').body end diff --git a/tests/requests/rds/describe_events.rb b/tests/requests/rds/describe_events.rb index 02ce168d5..d11d29e2c 100644 --- a/tests/requests/rds/describe_events.rb +++ b/tests/requests/rds/describe_events.rb @@ -1,12 +1,12 @@ -Shindo.tests('Aws::RDS | describe DB events requests',['aws', 'rds']) do +Shindo.tests('AWS::RDS | describe DB events requests',['aws', 'rds']) do tests('success') do pending if Fog.mocking? tests( '#describe_events' - ).formats(Aws::RDS::Formats::EVENT_LIST) do - Aws[:rds].describe_events().body['Events'] + ).formats(AWS::RDS::Formats::EVENT_LIST) do + Fog::AWS[:rds].describe_events().body['Events'] end end diff --git a/tests/requests/rds/event_subscription_tests.rb b/tests/requests/rds/event_subscription_tests.rb index 3de961069..5eaeedf36 100644 --- a/tests/requests/rds/event_subscription_tests.rb +++ b/tests/requests/rds/event_subscription_tests.rb @@ -1,11 +1,11 @@ -Shindo.tests('Aws::RDS | event subscription requests', ['aws', 'rds']) do +Shindo.tests('AWS::RDS | event subscription requests', ['aws', 'rds']) do pending unless Fog.mocking? @name = 'fog' @arn = 'arn:aws:sns:us-east-1:12345678910:fog' tests('success') do - tests('#create_event_subscription').formats(Aws::RDS::Formats::CREATE_EVENT_SUBSCRIPTION) do + tests('#create_event_subscription').formats(AWS::RDS::Formats::CREATE_EVENT_SUBSCRIPTION) do body = Fog::AWS[:rds].create_event_subscription('SubscriptionName' => @name, 'SnsTopicArn' => @arn).body returns(@name) { body['CreateEventSubscriptionResult']['EventSubscription']['CustSubscriptionId'] } @@ -13,12 +13,12 @@ Shindo.tests('Aws::RDS | event subscription requests', ['aws', 'rds']) do body end - tests("#describe_event_subscriptions").formats(Aws::RDS::Formats::DESCRIBE_EVENT_SUBSCRIPTIONS) do + tests("#describe_event_subscriptions").formats(AWS::RDS::Formats::DESCRIBE_EVENT_SUBSCRIPTIONS) do returns('active') { Fog::AWS[:rds].describe_event_subscriptions.body['DescribeEventSubscriptionsResult']['EventSubscriptionsList'].first['Status'] } Fog::AWS[:rds].describe_event_subscriptions.body end - tests("#delete_event_subscription").formats(Aws::RDS::Formats::BASIC) do + tests("#delete_event_subscription").formats(AWS::RDS::Formats::BASIC) do body = Fog::AWS[:rds].delete_event_subscription(@name).body returns('deleting') { Fog::AWS[:rds].describe_event_subscriptions('SubscriptionName' => @name).body['DescribeEventSubscriptionsResult']['EventSubscriptionsList'].first['Status'] } diff --git a/tests/requests/rds/helper.rb b/tests/requests/rds/helper.rb index 525ca99df..df28475d3 100644 --- a/tests/requests/rds/helper.rb +++ b/tests/requests/rds/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module RDS module Formats BASIC = { diff --git a/tests/requests/rds/instance_option_tests.rb b/tests/requests/rds/instance_option_tests.rb index 07eced68d..95f780a3f 100644 --- a/tests/requests/rds/instance_option_tests.rb +++ b/tests/requests/rds/instance_option_tests.rb @@ -1,7 +1,7 @@ -Shindo.tests('Aws::RDS | db instance option requests', ['aws', 'rds']) do +Shindo.tests('AWS::RDS | db instance option requests', ['aws', 'rds']) do tests('success') do - tests("#describe_orderable_db_instance_options('mysql)").formats(Aws::RDS::Formats::DESCRIBE_ORDERABLE_DB_INSTANCE_OPTION) do + tests("#describe_orderable_db_instance_options('mysql)").formats(AWS::RDS::Formats::DESCRIBE_ORDERABLE_DB_INSTANCE_OPTION) do body = Fog::AWS[:rds].describe_orderable_db_instance_options('mysql').body diff --git a/tests/requests/rds/instance_tests.rb b/tests/requests/rds/instance_tests.rb index d44412fc3..cff56d808 100644 --- a/tests/requests/rds/instance_tests.rb +++ b/tests/requests/rds/instance_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::RDS | instance requests', ['aws', 'rds']) do +Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do # Disabled due to https://github.com/fog/fog/1546 pending @@ -14,7 +14,7 @@ Shindo.tests('Aws::RDS | instance requests', ['aws', 'rds']) do tests('success') do - tests("#create_db_instance").formats(Aws::RDS::Formats::CREATE_DB_INSTANCE) do + tests("#create_db_instance").formats(AWS::RDS::Formats::CREATE_DB_INSTANCE) do result = Fog::AWS[:rds].create_db_instance(@db_instance_id, 'AllocatedStorage' => 5, 'DBInstanceClass' => 'db.m1.small', @@ -29,7 +29,7 @@ Shindo.tests('Aws::RDS | instance requests', ['aws', 'rds']) do result end - tests("#describe_db_instances").formats(Aws::RDS::Formats::DESCRIBE_DB_INSTANCES) do + tests("#describe_db_instances").formats(AWS::RDS::Formats::DESCRIBE_DB_INSTANCES) do Fog::AWS[:rds].describe_db_instances.body end @@ -37,7 +37,7 @@ Shindo.tests('Aws::RDS | instance requests', ['aws', 'rds']) do server.wait_for { ready? } new_storage = 6 - tests("#modify_db_instance with immediate apply").formats(Aws::RDS::Formats::MODIFY_DB_INSTANCE) do + tests("#modify_db_instance with immediate apply").formats(AWS::RDS::Formats::MODIFY_DB_INSTANCE) do body = Fog::AWS[:rds].modify_db_instance(@db_instance_id, true, 'AllocatedStorage' => new_storage).body tests 'pending storage' do instance = body['ModifyDBInstanceResult']['DBInstance'] @@ -54,7 +54,7 @@ Shindo.tests('Aws::RDS | instance requests', ['aws', 'rds']) do end tests("reboot db instance") do - tests("#reboot").formats(Aws::RDS::Formats::REBOOT_DB_INSTANCE) do + tests("#reboot").formats(AWS::RDS::Formats::REBOOT_DB_INSTANCE) do Fog::AWS[:rds].reboot_db_instance(@db_instance_id).body end end @@ -62,19 +62,19 @@ Shindo.tests('Aws::RDS | instance requests', ['aws', 'rds']) do server.wait_for { state == 'rebooting' } server.wait_for { state == 'available' } - tests("#create_db_snapshot").formats(Aws::RDS::Formats::CREATE_DB_SNAPSHOT) do + tests("#create_db_snapshot").formats(AWS::RDS::Formats::CREATE_DB_SNAPSHOT) do body = Fog::AWS[:rds].create_db_snapshot(@db_instance_id, @db_snapshot_id).body returns('creating') { body['CreateDBSnapshotResult']['DBSnapshot']['Status'] } body end - tests("#describe_db_snapshots").formats(Aws::RDS::Formats::DESCRIBE_DB_SNAPSHOTS) do + tests("#describe_db_snapshots").formats(AWS::RDS::Formats::DESCRIBE_DB_SNAPSHOTS) do body = Fog::AWS[:rds].describe_db_snapshots.body end server.wait_for { state == 'available' } - tests("#create read replica").formats(Aws::RDS::Formats::CREATE_READ_REPLICA) do + tests("#create read replica").formats(AWS::RDS::Formats::CREATE_READ_REPLICA) do Fog::AWS[:rds].create_db_instance_read_replica(@db_replica_id, @db_instance_id).body end @@ -90,11 +90,11 @@ Shindo.tests('Aws::RDS | instance requests', ['aws', 'rds']) do returns([@db_replica_id]) { server.read_replica_identifiers } end - tests("#promote read replica").formats(Aws::RDS::Formats::PROMOTE_READ_REPLICA) do + tests("#promote read replica").formats(AWS::RDS::Formats::PROMOTE_READ_REPLICA) do Fog::AWS[:rds].promote_read_replica(@db_replica_id).body end - tests("#delete_db_instance").formats(Aws::RDS::Formats::DELETE_DB_INSTANCE) do + tests("#delete_db_instance").formats(AWS::RDS::Formats::DELETE_DB_INSTANCE) do #server.wait_for { state == 'available' } Fog::AWS[:rds].delete_db_instance(@db_replica_id, nil, true) body = Fog::AWS[:rds].delete_db_instance(@db_instance_id, @db_final_snapshot_id).body @@ -105,7 +105,7 @@ Shindo.tests('Aws::RDS | instance requests', ['aws', 'rds']) do body end - tests("#delete_db_snapshot").formats(Aws::RDS::Formats::DELETE_DB_SNAPSHOT) do + tests("#delete_db_snapshot").formats(AWS::RDS::Formats::DELETE_DB_SNAPSHOT) do Fog::AWS[:rds].snapshots.get(@db_snapshot_id).wait_for { ready? } Fog::AWS[:rds].delete_db_snapshot(@db_snapshot_id).body end diff --git a/tests/requests/rds/log_file_tests.rb b/tests/requests/rds/log_file_tests.rb index d5d0a9c04..ba80fa998 100644 --- a/tests/requests/rds/log_file_tests.rb +++ b/tests/requests/rds/log_file_tests.rb @@ -1,11 +1,11 @@ -Shindo.tests('Aws::RDS | log file requests', %w[aws rds]) do +Shindo.tests('AWS::RDS | log file requests', %w[aws rds]) do tests('success') do pending if Fog.mocking? suffix = rand(65536).to_s(16) @db_instance_id = "fog-test-#{suffix}" - tests('#describe_db_log_files').formats(Aws::RDS::Formats::DESCRIBE_DB_LOG_FILES) do + tests('#describe_db_log_files').formats(AWS::RDS::Formats::DESCRIBE_DB_LOG_FILES) do result = Fog::AWS[:rds].describe_db_log_files(@db_instance_id).body['DescribeDBLogFilesResult'] returns(true) { result['DBLogFiles'].size > 0 } result diff --git a/tests/requests/rds/parameter_group_tests.rb b/tests/requests/rds/parameter_group_tests.rb index fbe558a7f..0b120d802 100644 --- a/tests/requests/rds/parameter_group_tests.rb +++ b/tests/requests/rds/parameter_group_tests.rb @@ -1,7 +1,7 @@ -Shindo.tests('Aws::RDS | parameter group requests', ['aws', 'rds']) do +Shindo.tests('AWS::RDS | parameter group requests', ['aws', 'rds']) do tests('success') do - tests("#create_db_parameter_groups").formats(Aws::RDS::Formats::CREATE_DB_PARAMETER_GROUP) do + tests("#create_db_parameter_groups").formats(AWS::RDS::Formats::CREATE_DB_PARAMETER_GROUP) do body = Fog::AWS[:rds].create_db_parameter_group('fog-group', 'MySQL5.1', 'Some description').body returns( 'mysql5.1') { body['CreateDBParameterGroupResult']['DBParameterGroup']['DBParameterGroupFamily']} @@ -13,7 +13,7 @@ Shindo.tests('Aws::RDS | parameter group requests', ['aws', 'rds']) do Fog::AWS[:rds].create_db_parameter_group('other-fog-group', 'MySQL5.1', 'Some description') - tests("#describe_db_parameter_groups").formats(Aws::RDS::Formats::DESCRIBE_DB_PARAMETER_GROUP) do + tests("#describe_db_parameter_groups").formats(AWS::RDS::Formats::DESCRIBE_DB_PARAMETER_GROUP) do body = Fog::AWS[:rds].describe_db_parameter_groups().body @@ -21,7 +21,7 @@ Shindo.tests('Aws::RDS | parameter group requests', ['aws', 'rds']) do body end - tests("#describe_db_parameter_groups('fog-group)").formats(Aws::RDS::Formats::DESCRIBE_DB_PARAMETER_GROUP) do + tests("#describe_db_parameter_groups('fog-group)").formats(AWS::RDS::Formats::DESCRIBE_DB_PARAMETER_GROUP) do body = Fog::AWS[:rds].describe_db_parameter_groups('fog-group').body @@ -35,7 +35,7 @@ Shindo.tests('Aws::RDS | parameter group requests', ['aws', 'rds']) do body end - tests("delete_db_parameter_group").formats(Aws::RDS::Formats::BASIC) do + tests("delete_db_parameter_group").formats(AWS::RDS::Formats::BASIC) do body = Fog::AWS[:rds].delete_db_parameter_group('fog-group').body raises(Fog::AWS::RDS::NotFound) {Fog::AWS[:rds].describe_db_parameter_groups('fog-group')} diff --git a/tests/requests/rds/parameter_request_tests.rb b/tests/requests/rds/parameter_request_tests.rb index d639a3071..8c35082c2 100644 --- a/tests/requests/rds/parameter_request_tests.rb +++ b/tests/requests/rds/parameter_request_tests.rb @@ -1,10 +1,10 @@ -Shindo.tests('Aws::RDS | parameter requests', ['aws', 'rds']) do +Shindo.tests('AWS::RDS | parameter requests', ['aws', 'rds']) do tests('success') do pending if Fog.mocking? Fog::AWS[:rds].create_db_parameter_group('fog-group', 'MySQL5.1', 'Some description') - tests('#modify_db_parameter_group').formats(Aws::RDS::Formats::MODIFY_PARAMETER_GROUP) do + tests('#modify_db_parameter_group').formats(AWS::RDS::Formats::MODIFY_PARAMETER_GROUP) do body = Fog::AWS[:rds].modify_db_parameter_group('fog-group',[ {'ParameterName' => 'query_cache_size', 'ParameterValue' => '12345', @@ -14,7 +14,7 @@ Shindo.tests('Aws::RDS | parameter requests', ['aws', 'rds']) do body end - tests('#describe_db_parameters').formats(Aws::RDS::Formats::DESCRIBE_DB_PARAMETERS) do + tests('#describe_db_parameters').formats(AWS::RDS::Formats::DESCRIBE_DB_PARAMETERS) do Fog::AWS[:rds].describe_db_parameters('fog-group', :max_records => 20).body end diff --git a/tests/requests/rds/security_group_tests.rb b/tests/requests/rds/security_group_tests.rb index 951984d0f..0fbc2cbae 100644 --- a/tests/requests/rds/security_group_tests.rb +++ b/tests/requests/rds/security_group_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::RDS | security group requests', ['aws', 'rds']) do +Shindo.tests('AWS::RDS | security group requests', ['aws', 'rds']) do suffix = rand(65536).to_s(16) @sec_group_name = "fog-sec-group-#{suffix}" @@ -10,7 +10,7 @@ Shindo.tests('Aws::RDS | security group requests', ['aws', 'rds']) do tests('success') do - tests("#create_db_security_group").formats(Aws::RDS::Formats::CREATE_DB_SECURITY_GROUP) do + tests("#create_db_security_group").formats(AWS::RDS::Formats::CREATE_DB_SECURITY_GROUP) do body = Fog::AWS[:rds].create_db_security_group(@sec_group_name, 'Some description').body returns( @sec_group_name) { body['CreateDBSecurityGroupResult']['DBSecurityGroup']['DBSecurityGroupName']} @@ -21,11 +21,11 @@ Shindo.tests('Aws::RDS | security group requests', ['aws', 'rds']) do body end - tests("#describe_db_security_groups").formats(Aws::RDS::Formats::DESCRIBE_DB_SECURITY_GROUP) do + tests("#describe_db_security_groups").formats(AWS::RDS::Formats::DESCRIBE_DB_SECURITY_GROUP) do Fog::AWS[:rds].describe_db_security_groups.body end - tests("#authorize_db_security_group_ingress CIDR").formats(Aws::RDS::Formats::AUTHORIZE_DB_SECURITY_GROUP) do + tests("#authorize_db_security_group_ingress CIDR").formats(AWS::RDS::Formats::AUTHORIZE_DB_SECURITY_GROUP) do @cidr = '0.0.0.0/0' body = Fog::AWS[:rds].authorize_db_security_group_ingress(@sec_group_name,{'CIDRIP'=>@cidr}).body @@ -36,7 +36,7 @@ Shindo.tests('Aws::RDS | security group requests', ['aws', 'rds']) do sec_group = Fog::AWS[:rds].security_groups.get(@sec_group_name) sec_group.wait_for {ready?} - tests("#authorize_db_security_group_ingress another CIDR").formats(Aws::RDS::Formats::AUTHORIZE_DB_SECURITY_GROUP) do + tests("#authorize_db_security_group_ingress another CIDR").formats(AWS::RDS::Formats::AUTHORIZE_DB_SECURITY_GROUP) do @cidr = "10.0.0.0/24" body = Fog::AWS[:rds].authorize_db_security_group_ingress(@sec_group_name,{'CIDRIP'=>@cidr}).body @@ -47,20 +47,20 @@ Shindo.tests('Aws::RDS | security group requests', ['aws', 'rds']) do sec_group = Fog::AWS[:rds].security_groups.get(@sec_group_name) sec_group.wait_for {ready?} - tests("#count CIDRIP").formats(Aws::RDS::Formats::DESCRIBE_DB_SECURITY_GROUP) do + tests("#count CIDRIP").formats(AWS::RDS::Formats::DESCRIBE_DB_SECURITY_GROUP) do body = Fog::AWS[:rds].describe_db_security_groups(@sec_group_name).body returns(2) { body['DescribeDBSecurityGroupsResult']['DBSecurityGroups'][0]['IPRanges'].size } body end - tests("#revoke_db_security_group_ingress CIDR").formats(Aws::RDS::Formats::REVOKE_DB_SECURITY_GROUP) do + tests("#revoke_db_security_group_ingress CIDR").formats(AWS::RDS::Formats::REVOKE_DB_SECURITY_GROUP) do @cidr = '0.0.0.0/0' body = Fog::AWS[:rds].revoke_db_security_group_ingress(@sec_group_name,{'CIDRIP'=> @cidr}).body returns("revoking") { body['RevokeDBSecurityGroupIngressResult']['DBSecurityGroup']['IPRanges'].find{|h| h['CIDRIP'] == @cidr}['Status']} body end - tests("#authorize_db_security_group_ingress EC2").formats(Aws::RDS::Formats::AUTHORIZE_DB_SECURITY_GROUP) do + tests("#authorize_db_security_group_ingress EC2").formats(AWS::RDS::Formats::AUTHORIZE_DB_SECURITY_GROUP) do @ec2_sec_group = 'default' body = Fog::AWS[:rds].authorize_db_security_group_ingress(@sec_group_name,{'EC2SecurityGroupName' => @ec2_sec_group, 'EC2SecurityGroupOwnerId' => @owner_id}).body @@ -78,7 +78,7 @@ Shindo.tests('Aws::RDS | security group requests', ['aws', 'rds']) do sec_group = Fog::AWS[:rds].security_groups.get(@sec_group_name) sec_group.wait_for {ready?} - tests("#revoke_db_security_group_ingress EC2").formats(Aws::RDS::Formats::REVOKE_DB_SECURITY_GROUP) do + tests("#revoke_db_security_group_ingress EC2").formats(AWS::RDS::Formats::REVOKE_DB_SECURITY_GROUP) do @ec2_sec_group = 'default' body = Fog::AWS[:rds].revoke_db_security_group_ingress(@sec_group_name,{'EC2SecurityGroupName' => @ec2_sec_group, 'EC2SecurityGroupOwnerId' => @owner_id}).body @@ -90,7 +90,7 @@ Shindo.tests('Aws::RDS | security group requests', ['aws', 'rds']) do #TODO, authorize ec2 security groups - tests("#delete_db_security_group").formats(Aws::RDS::Formats::BASIC) do + tests("#delete_db_security_group").formats(AWS::RDS::Formats::BASIC) do body = Fog::AWS[:rds].delete_db_security_group(@sec_group_name).body raises(Fog::AWS::RDS::NotFound) {Fog::AWS[:rds].describe_db_security_groups(@sec_group_name)} diff --git a/tests/requests/rds/subnet_groups_tests.rb b/tests/requests/rds/subnet_groups_tests.rb index 0763019a3..f85b2be0b 100644 --- a/tests/requests/rds/subnet_groups_tests.rb +++ b/tests/requests/rds/subnet_groups_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::RDS | subnet group requests', ['aws', 'rds']) do +Shindo.tests('AWS::RDS | subnet group requests', ['aws', 'rds']) do # random_differentiator # Useful when rapidly re-running tests, so we don't have to wait # serveral minutes for deleted VPCs/subnets to disappear @@ -23,7 +23,7 @@ Shindo.tests('Aws::RDS | subnet group requests', ['aws', 'rds']) do subnet_ids = @subnets.map { |sn| sn['subnetId'] }.to_a - tests("#create_db_subnet_group").formats(Aws::RDS::Formats::CREATE_DB_SUBNET_GROUP) do + tests("#create_db_subnet_group").formats(AWS::RDS::Formats::CREATE_DB_SUBNET_GROUP) do result = Fog::AWS[:rds].create_db_subnet_group(@subnet_group_name, subnet_ids, 'A subnet group').body returns(@subnet_group_name) { result['CreateDBSubnetGroupResult']['DBSubnetGroup']['DBSubnetGroupName'] } @@ -34,11 +34,11 @@ Shindo.tests('Aws::RDS | subnet group requests', ['aws', 'rds']) do result end - tests("#describe_db_subnet_groups").formats(Aws::RDS::Formats::DESCRIBE_DB_SUBNET_GROUPS) do + tests("#describe_db_subnet_groups").formats(AWS::RDS::Formats::DESCRIBE_DB_SUBNET_GROUPS) do Fog::AWS[:rds].describe_db_subnet_groups.body end - tests("#delete_db_subnet_group").formats(Aws::RDS::Formats::BASIC) do + tests("#delete_db_subnet_group").formats(AWS::RDS::Formats::BASIC) do Fog::AWS[:rds].delete_db_subnet_group(@subnet_group_name).body end diff --git a/tests/requests/rds/tagging_tests.rb b/tests/requests/rds/tagging_tests.rb index 6ad943207..413b592ff 100644 --- a/tests/requests/rds/tagging_tests.rb +++ b/tests/requests/rds/tagging_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::RDS | tagging requests', ['aws', 'rds']) do +Shindo.tests('AWS::RDS | tagging requests', ['aws', 'rds']) do @rds = Fog::AWS[:rds] @db_instance_id = "fog-test-#{rand(65536).to_s(16)}" Formatador.display_line "Creating RDS instance #{@db_instance_id}" @@ -15,7 +15,7 @@ Shindo.tests('Aws::RDS | tagging requests', ['aws', 'rds']) do two_tags = {'key2' => 'value2', 'key3' => 'value3'} tests("#add_tags_to_resource with a single tag"). - formats(Aws::RDS::Formats::BASIC) do + formats(AWS::RDS::Formats::BASIC) do result = @rds.add_tags_to_resource(@db_instance_id, single_tag).body returns(single_tag) do @rds.list_tags_for_resource(@db_instance_id). @@ -25,7 +25,7 @@ Shindo.tests('Aws::RDS | tagging requests', ['aws', 'rds']) do end tests("#add_tags_to_resource with a multiple tags"). - formats(Aws::RDS::Formats::BASIC) do + formats(AWS::RDS::Formats::BASIC) do result = @rds.add_tags_to_resource(@db_instance_id, two_tags).body returns(single_tag.merge(two_tags)) do @rds.list_tags_for_resource(@db_instance_id). @@ -34,7 +34,7 @@ Shindo.tests('Aws::RDS | tagging requests', ['aws', 'rds']) do result end - tests("#remove_tags_from_resource").formats(Aws::RDS::Formats::BASIC) do + tests("#remove_tags_from_resource").formats(AWS::RDS::Formats::BASIC) do result = @rds.remove_tags_from_resource( @db_instance_id, single_tag.keys).body returns(two_tags) do @@ -45,7 +45,7 @@ Shindo.tests('Aws::RDS | tagging requests', ['aws', 'rds']) do end tests("#list_tags_for_resource"). - formats(Aws::RDS::Formats::LIST_TAGS_FOR_RESOURCE) do + formats(AWS::RDS::Formats::LIST_TAGS_FOR_RESOURCE) do result = @rds.list_tags_for_resource(@db_instance_id).body returns(two_tags) do result['ListTagsForResourceResult']['TagList'] diff --git a/tests/requests/ses/helper.rb b/tests/requests/ses/helper.rb index 8d773c101..b1bc5bac2 100644 --- a/tests/requests/ses/helper.rb +++ b/tests/requests/ses/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module SES module Formats BASIC = { diff --git a/tests/requests/ses/verified_domain_identity_tests.rb b/tests/requests/ses/verified_domain_identity_tests.rb index 91392d9cf..52ef02323 100644 --- a/tests/requests/ses/verified_domain_identity_tests.rb +++ b/tests/requests/ses/verified_domain_identity_tests.rb @@ -1,8 +1,8 @@ -Shindo.tests('Aws::SES | verified domain identity requests', ['aws', 'ses']) do +Shindo.tests('AWS::SES | verified domain identity requests', ['aws', 'ses']) do tests('success') do - tests("#verify_domain_identity('example.com')").formats(Aws::SES::Formats::BASIC) do + tests("#verify_domain_identity('example.com')").formats(AWS::SES::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:ses].verify_domain_identity('example.com').body end diff --git a/tests/requests/ses/verified_email_address_tests.rb b/tests/requests/ses/verified_email_address_tests.rb index 8f8860bf1..3a972f822 100644 --- a/tests/requests/ses/verified_email_address_tests.rb +++ b/tests/requests/ses/verified_email_address_tests.rb @@ -1,19 +1,19 @@ -Shindo.tests('Aws::SES | verified email address requests', ['aws', 'ses']) do +Shindo.tests('AWS::SES | verified email address requests', ['aws', 'ses']) do tests('success') do - tests("#verify_email_address('test@example.com')").formats(Aws::SES::Formats::BASIC) do + tests("#verify_email_address('test@example.com')").formats(AWS::SES::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:ses].verify_email_address('test@example.com').body end - tests("#list_verified_email_addresses").formats(Aws::SES::Formats::BASIC.merge('VerifiedEmailAddresses' => [String])) do + tests("#list_verified_email_addresses").formats(AWS::SES::Formats::BASIC.merge('VerifiedEmailAddresses' => [String])) do pending if Fog.mocking? Fog::AWS[:ses].list_verified_email_addresses.body end # email won't be there to delete, but succeeds regardless - tests("#delete_verified_email_address('test@example.com')").formats(Aws::SES::Formats::BASIC) do + tests("#delete_verified_email_address('test@example.com')").formats(AWS::SES::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:ses].delete_verified_email_address('notaanemail@example.com').body end diff --git a/tests/requests/simpledb/attributes_tests.rb b/tests/requests/simpledb/attributes_tests.rb index 6075352de..ad8edc8dd 100644 --- a/tests/requests/simpledb/attributes_tests.rb +++ b/tests/requests/simpledb/attributes_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::SimpleDB | attributes requests', ['aws']) do +Shindo.tests('AWS::SimpleDB | attributes requests', ['aws']) do @domain_name = "fog_domain_#{Time.now.to_f.to_s.gsub('.','')}" @@ -6,7 +6,7 @@ Shindo.tests('Aws::SimpleDB | attributes requests', ['aws']) do tests('success') do - tests("#batch_put_attributes('#{@domain_name}', { 'a' => { 'b' => 'c', 'd' => 'e' }, 'x' => { 'y' => 'z' } }).body").formats(Aws::SimpleDB::Formats::BASIC) do + tests("#batch_put_attributes('#{@domain_name}', { 'a' => { 'b' => 'c', 'd' => 'e' }, 'x' => { 'y' => 'z' } }).body").formats(AWS::SimpleDB::Formats::BASIC) do Fog::AWS[:simpledb].batch_put_attributes(@domain_name, { 'a' => { 'b' => 'c', 'd' => 'e' }, 'x' => { 'y' => 'z' } }).body end @@ -23,11 +23,11 @@ Shindo.tests('Aws::SimpleDB | attributes requests', ['aws']) do Fog::AWS[:simpledb].select("select * from #{@domain_name}", {'ConsistentRead' => true}).body['Items'] end - tests("#put_attributes('#{@domain_name}', 'conditional', { 'version' => '1' }).body").formats(Aws::SimpleDB::Formats::BASIC) do + tests("#put_attributes('#{@domain_name}', 'conditional', { 'version' => '1' }).body").formats(AWS::SimpleDB::Formats::BASIC) do Fog::AWS[:simpledb].put_attributes(@domain_name, 'conditional', { 'version' => '1' }).body end - tests("#put_attributes('#{@domain_name}', 'conditional', { 'version' => '2' }, :expect => { 'version' => '1' }, :replace => ['version']).body").formats(Aws::SimpleDB::Formats::BASIC) do + tests("#put_attributes('#{@domain_name}', 'conditional', { 'version' => '2' }, :expect => { 'version' => '1' }, :replace => ['version']).body").formats(AWS::SimpleDB::Formats::BASIC) do Fog::AWS[:simpledb].put_attributes(@domain_name, 'conditional', { 'version' => '2' }, :expect => { 'version' => '1' }, :replace => ['version']).body end @@ -41,7 +41,7 @@ Shindo.tests('Aws::SimpleDB | attributes requests', ['aws']) do Fog::AWS[:simpledb].get_attributes(@domain_name, 'a', {'AttributeName' => ['d'], 'ConsistentRead' => true}).body['Attributes'] end - tests("#delete_attributes('#{@domain_name}', 'a').body").formats(Aws::SimpleDB::Formats::BASIC) do + tests("#delete_attributes('#{@domain_name}', 'a').body").formats(AWS::SimpleDB::Formats::BASIC) do Fog::AWS[:simpledb].delete_attributes(@domain_name, 'a').body end diff --git a/tests/requests/simpledb/domain_tests.rb b/tests/requests/simpledb/domain_tests.rb index 52be3c5f9..f99a56bf2 100644 --- a/tests/requests/simpledb/domain_tests.rb +++ b/tests/requests/simpledb/domain_tests.rb @@ -1,6 +1,6 @@ -Shindo.tests('Aws::SimpleDB | domain requests', ['aws']) do +Shindo.tests('AWS::SimpleDB | domain requests', ['aws']) do - @domain_metadata_format = Aws::SimpleDB::Formats::BASIC.merge({ + @domain_metadata_format = AWS::SimpleDB::Formats::BASIC.merge({ 'AttributeNameCount' => Integer, 'AttributeNamesSizeBytes' => Integer, 'AttributeValueCount' => Integer, @@ -14,7 +14,7 @@ Shindo.tests('Aws::SimpleDB | domain requests', ['aws']) do tests('success') do - tests("#create_domain(#{@domain_name})").formats(Aws::SimpleDB::Formats::BASIC) do + tests("#create_domain(#{@domain_name})").formats(AWS::SimpleDB::Formats::BASIC) do Fog::AWS[:simpledb].create_domain(@domain_name).body end @@ -26,11 +26,11 @@ Shindo.tests('Aws::SimpleDB | domain requests', ['aws']) do Fog::AWS[:simpledb].domain_metadata(@domain_name).body end - tests("#list_domains").formats(Aws::SimpleDB::Formats::BASIC.merge('Domains' => [String])) do + tests("#list_domains").formats(AWS::SimpleDB::Formats::BASIC.merge('Domains' => [String])) do Fog::AWS[:simpledb].list_domains.body end - tests("#delete_domain(#{@domain_name})").formats(Aws::SimpleDB::Formats::BASIC) do + tests("#delete_domain(#{@domain_name})").formats(AWS::SimpleDB::Formats::BASIC) do Fog::AWS[:simpledb].delete_domain(@domain_name).body end diff --git a/tests/requests/simpledb/helper.rb b/tests/requests/simpledb/helper.rb index d29de6275..edb379939 100644 --- a/tests/requests/simpledb/helper.rb +++ b/tests/requests/simpledb/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module SimpleDB module Formats BASIC = { diff --git a/tests/requests/sns/helper.rb b/tests/requests/sns/helper.rb index efc06c84d..7cc87d183 100644 --- a/tests/requests/sns/helper.rb +++ b/tests/requests/sns/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module SNS module Formats BASIC = { diff --git a/tests/requests/sns/subscription_tests.rb b/tests/requests/sns/subscription_tests.rb index 3c8caca9c..681bcc4de 100644 --- a/tests/requests/sns/subscription_tests.rb +++ b/tests/requests/sns/subscription_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::SES | topic lifecycle tests', ['aws', 'sns']) do +Shindo.tests('AWS::SES | topic lifecycle tests', ['aws', 'sns']) do unless Fog.mocking? @topic_arn = Fog::AWS[:sns].create_topic('fog_subscription_tests').body['TopicArn'] @@ -15,7 +15,7 @@ Shindo.tests('Aws::SES | topic lifecycle tests', ['aws', 'sns']) do 'StringEquals' => { 'aws:SourceArn' => @topic_arn } }, 'Effect' => 'Allow', - 'Principal' => { 'Aws' => '*' }, + 'Principal' => { 'AWS' => '*' }, 'Resource' => @queue_arn, 'Sid' => "#{@topic_arn}+sqs:SendMessage" }, @@ -26,14 +26,14 @@ Shindo.tests('Aws::SES | topic lifecycle tests', ['aws', 'sns']) do tests('success') do - tests("#subscribe('#{@topic_arn}', '#{@queue_arn}', 'sqs')").formats(Aws::SNS::Formats::BASIC.merge('SubscriptionArn' => String)) do + tests("#subscribe('#{@topic_arn}', '#{@queue_arn}', 'sqs')").formats(AWS::SNS::Formats::BASIC.merge('SubscriptionArn' => String)) do pending if Fog.mocking? body = Fog::AWS[:sns].subscribe(@topic_arn, @queue_arn, 'sqs').body @subscription_arn = body['SubscriptionArn'] body end - list_subscriptions_format = Aws::SNS::Formats::BASIC.merge({ + list_subscriptions_format = AWS::SNS::Formats::BASIC.merge({ 'Subscriptions' => [{ 'Endpoint' => String, 'Owner' => String, @@ -53,7 +53,7 @@ Shindo.tests('Aws::SES | topic lifecycle tests', ['aws', 'sns']) do body = Fog::AWS[:sns].list_subscriptions_by_topic(@topic_arn).body end - tests("#publish('#{@topic_arn}', 'message')").formats(Aws::SNS::Formats::BASIC.merge('MessageId' => String)) do + tests("#publish('#{@topic_arn}', 'message')").formats(AWS::SNS::Formats::BASIC.merge('MessageId' => String)) do pending if Fog.mocking? body = Fog::AWS[:sns].publish(@topic_arn, 'message').body end @@ -67,7 +67,7 @@ Shindo.tests('Aws::SES | topic lifecycle tests', ['aws', 'sns']) do Fog::JSON.decode(message['Body'])['Message'] end - tests("#unsubscribe('#{@subscription_arn}')").formats(Aws::SNS::Formats::BASIC) do + tests("#unsubscribe('#{@subscription_arn}')").formats(AWS::SNS::Formats::BASIC) do pending if Fog.mocking? Fog::AWS[:sns].unsubscribe(@subscription_arn).body end diff --git a/tests/requests/sns/topic_tests.rb b/tests/requests/sns/topic_tests.rb index 671b6c34e..bb5dea138 100644 --- a/tests/requests/sns/topic_tests.rb +++ b/tests/requests/sns/topic_tests.rb @@ -1,22 +1,22 @@ -Shindo.tests('Aws::SNS | topic lifecycle tests', ['aws', 'sns']) do +Shindo.tests('AWS::SNS | topic lifecycle tests', ['aws', 'sns']) do tests('success') do - tests("#create_topic('fog_topic_tests')").formats(Aws::SNS::Formats::BASIC.merge('TopicArn' => String)) do + tests("#create_topic('fog_topic_tests')").formats(AWS::SNS::Formats::BASIC.merge('TopicArn' => String)) do body = Fog::AWS[:sns].create_topic('fog_topic_tests').body @topic_arn = body["TopicArn"] body end - tests("#list_topics").formats(Aws::SNS::Formats::BASIC.merge('Topics' => [String])) do + tests("#list_topics").formats(AWS::SNS::Formats::BASIC.merge('Topics' => [String])) do Fog::AWS[:sns].list_topics.body end - tests("#set_topic_attributes('#{@topic_arn}', 'DisplayName', 'other-fog_topic_tests')").formats(Aws::SNS::Formats::BASIC) do + tests("#set_topic_attributes('#{@topic_arn}', 'DisplayName', 'other-fog_topic_tests')").formats(AWS::SNS::Formats::BASIC) do Fog::AWS[:sns].set_topic_attributes(@topic_arn, 'DisplayName', 'other-fog_topic_tests').body end - get_topic_attributes_format = Aws::SNS::Formats::BASIC.merge({ + get_topic_attributes_format = AWS::SNS::Formats::BASIC.merge({ 'Attributes' => { 'DisplayName' => String, 'Owner' => String, @@ -32,7 +32,7 @@ Shindo.tests('Aws::SNS | topic lifecycle tests', ['aws', 'sns']) do Fog::AWS[:sns].get_topic_attributes(@topic_arn).body end - tests("#delete_topic('#{@topic_arn}')").formats(Aws::SNS::Formats::BASIC) do + tests("#delete_topic('#{@topic_arn}')").formats(AWS::SNS::Formats::BASIC) do Fog::AWS[:sns].delete_topic(@topic_arn).body end diff --git a/tests/requests/sqs/helper.rb b/tests/requests/sqs/helper.rb index ff0a01473..273e2732c 100644 --- a/tests/requests/sqs/helper.rb +++ b/tests/requests/sqs/helper.rb @@ -1,4 +1,4 @@ -class Aws +class AWS module SQS module Formats BASIC = { diff --git a/tests/requests/sqs/message_tests.rb b/tests/requests/sqs/message_tests.rb index e7502b34d..e8399e8a1 100644 --- a/tests/requests/sqs/message_tests.rb +++ b/tests/requests/sqs/message_tests.rb @@ -1,10 +1,10 @@ -Shindo.tests('Aws::SQS | message requests', ['aws']) do +Shindo.tests('AWS::SQS | message requests', ['aws']) do tests('success') do @queue_url = Fog::AWS[:sqs].create_queue('fog_message_tests').body['QueueUrl'] - send_message_format = Aws::SQS::Formats::BASIC.merge({ + send_message_format = AWS::SQS::Formats::BASIC.merge({ 'MessageId' => String, 'MD5OfMessageBody' => String }) @@ -13,7 +13,7 @@ Shindo.tests('Aws::SQS | message requests', ['aws']) do Fog::AWS[:sqs].send_message(@queue_url, 'message').body end - receive_message_format = Aws::SQS::Formats::BASIC.merge({ + receive_message_format = AWS::SQS::Formats::BASIC.merge({ 'Message' => [{ 'Attributes' => { 'ApproximateFirstReceiveTimestamp' => Time, @@ -34,11 +34,11 @@ Shindo.tests('Aws::SQS | message requests', ['aws']) do data end - tests("#change_message_visibility('#{@queue_url}, '#{@receipt_handle}', 60)").formats(Aws::SQS::Formats::BASIC) do + tests("#change_message_visibility('#{@queue_url}, '#{@receipt_handle}', 60)").formats(AWS::SQS::Formats::BASIC) do Fog::AWS[:sqs].change_message_visibility(@queue_url, @receipt_handle, 60).body end - tests("#delete_message('#{@queue_url}', '#{@receipt_handle}')").formats(Aws::SQS::Formats::BASIC) do + tests("#delete_message('#{@queue_url}', '#{@receipt_handle}')").formats(AWS::SQS::Formats::BASIC) do Fog::AWS[:sqs].delete_message(@queue_url, @receipt_handle).body end diff --git a/tests/requests/sqs/queue_tests.rb b/tests/requests/sqs/queue_tests.rb index f0e278a98..da2bab01c 100644 --- a/tests/requests/sqs/queue_tests.rb +++ b/tests/requests/sqs/queue_tests.rb @@ -1,8 +1,8 @@ -Shindo.tests('Aws::SQS | queue requests', ['aws']) do +Shindo.tests('AWS::SQS | queue requests', ['aws']) do tests('success') do - create_queue_format = Aws::SQS::Formats::BASIC.merge({ + create_queue_format = AWS::SQS::Formats::BASIC.merge({ 'QueueUrl' => String }) @@ -12,7 +12,7 @@ Shindo.tests('Aws::SQS | queue requests', ['aws']) do data end - list_queues_format = Aws::SQS::Formats::BASIC.merge({ + list_queues_format = AWS::SQS::Formats::BASIC.merge({ 'QueueUrls' => [String] }) @@ -20,11 +20,11 @@ Shindo.tests('Aws::SQS | queue requests', ['aws']) do Fog::AWS[:sqs].list_queues.body end - tests("#set_queue_attributes('#{@queue_url}', 'VisibilityTimeout', 60)").formats(Aws::SQS::Formats::BASIC) do + tests("#set_queue_attributes('#{@queue_url}', 'VisibilityTimeout', 60)").formats(AWS::SQS::Formats::BASIC) do Fog::AWS[:sqs].set_queue_attributes(@queue_url, 'VisibilityTimeout', 60).body end - get_queue_attributes_format = Aws::SQS::Formats::BASIC.merge({ + get_queue_attributes_format = AWS::SQS::Formats::BASIC.merge({ 'Attributes' => { 'ApproximateNumberOfMessages' => Integer, 'ApproximateNumberOfMessagesNotVisible' => Integer, @@ -41,7 +41,7 @@ Shindo.tests('Aws::SQS | queue requests', ['aws']) do Fog::AWS[:sqs].get_queue_attributes(@queue_url, 'All').body end - tests("#delete_queue('#{@queue_url}')").formats(Aws::SQS::Formats::BASIC) do + tests("#delete_queue('#{@queue_url}')").formats(AWS::SQS::Formats::BASIC) do Fog::AWS[:sqs].delete_queue(@queue_url).body end diff --git a/tests/requests/storage/delete_multiple_objects_tests.rb b/tests/requests/storage/delete_multiple_objects_tests.rb index 9da91d43c..2994b5e5c 100644 --- a/tests/requests/storage/delete_multiple_objects_tests.rb +++ b/tests/requests/storage/delete_multiple_objects_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::Storage | delete_multiple_objects', ['aws']) do +Shindo.tests('AWS::Storage | delete_multiple_objects', ['aws']) do @directory = Fog::Storage[:aws].directories.create(:key => 'fogobjecttests-' + Time.now.to_i.to_s(32)) tests("doesn't alter options") do diff --git a/tests/requests/storage/object_tests.rb b/tests/requests/storage/object_tests.rb index 420e2d58e..417b53796 100644 --- a/tests/requests/storage/object_tests.rb +++ b/tests/requests/storage/object_tests.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -Shindo.tests('Aws::Storage | object requests', ['aws']) do +Shindo.tests('AWS::Storage | object requests', ['aws']) do @directory = Fog::Storage[:aws].directories.create(:key => 'fogobjecttests-' + Time.now.to_i.to_s(32)) @aws_owner = Fog::Storage[:aws].get_bucket_acl(@directory.key).body['Owner'] diff --git a/tests/requests/sts/assume_role_tests.rb b/tests/requests/sts/assume_role_tests.rb index 43df5c69e..cce659fcf 100644 --- a/tests/requests/sts/assume_role_tests.rb +++ b/tests/requests/sts/assume_role_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::STS | assume role', ['aws']) do +Shindo.tests('AWS::STS | assume role', ['aws']) do @policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]} diff --git a/tests/requests/sts/assume_role_with_saml_tests.rb b/tests/requests/sts/assume_role_with_saml_tests.rb index 1e4aa4f3b..e482365d6 100644 --- a/tests/requests/sts/assume_role_with_saml_tests.rb +++ b/tests/requests/sts/assume_role_with_saml_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::STS | assume role with SAML', ['aws']) do +Shindo.tests('AWS::STS | assume role with SAML', ['aws']) do @policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]} diff --git a/tests/requests/sts/get_federation_token_tests.rb b/tests/requests/sts/get_federation_token_tests.rb index 79bba8411..75673a23d 100644 --- a/tests/requests/sts/get_federation_token_tests.rb +++ b/tests/requests/sts/get_federation_token_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::STS | session tokens', ['aws']) do +Shindo.tests('AWS::STS | session tokens', ['aws']) do @policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]} diff --git a/tests/requests/sts/session_token_tests.rb b/tests/requests/sts/session_token_tests.rb index c4573cff6..85a067840 100644 --- a/tests/requests/sts/session_token_tests.rb +++ b/tests/requests/sts/session_token_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Aws::STS | session tokens', ['aws']) do +Shindo.tests('AWS::STS | session tokens', ['aws']) do @session_format = { 'SessionToken' => String, diff --git a/tests/signaturev4_tests.rb b/tests/signaturev4_tests.rb index 82812dfdb..1022f9f42 100644 --- a/tests/signaturev4_tests.rb +++ b/tests/signaturev4_tests.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -Shindo.tests('Aws | signaturev4', ['aws']) do +Shindo.tests('AWS | signaturev4', ['aws']) do @now = Fog::Time.utc(2011,9,9,23,36,0) @@ -9,63 +9,63 @@ Shindo.tests('Aws | signaturev4', ['aws']) do tests('get-vanilla') do returns(@signer.sign({:headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, @now)) do - 'Aws4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470' + 'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470' end end tests('get-vanilla-query-order-key with symbol keys') do returns(@signer.sign({:query => {:'a' => 'foo', :'b' => 'foo'}, :headers => {:'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, @now)) do - 'Aws4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=0dc122f3b28b831ab48ba65cb47300de53fbe91b577fe113edac383730254a3b' + 'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=0dc122f3b28b831ab48ba65cb47300de53fbe91b577fe113edac383730254a3b' end end tests('get-vanilla-query-order-key') do returns(@signer.sign({:query => {'a' => 'foo', 'b' => 'foo'}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, @now)) do - 'Aws4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=0dc122f3b28b831ab48ba65cb47300de53fbe91b577fe113edac383730254a3b' + 'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=0dc122f3b28b831ab48ba65cb47300de53fbe91b577fe113edac383730254a3b' end end tests('get-unreserved') do returns(@signer.sign({:headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/-._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'}, @now)) do - 'Aws4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=830cc36d03f0f84e6ee4953fbe701c1c8b71a0372c63af9255aa364dd183281e' + 'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=830cc36d03f0f84e6ee4953fbe701c1c8b71a0372c63af9255aa364dd183281e' end end tests('post-x-www-form-urlencoded-parameter') do returns(@signer.sign({:headers => {'Content-type' => 'application/x-www-form-urlencoded; charset=utf8', 'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :post, :path => '/', :body => 'foo=bar'}, @now)) do - 'Aws4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=content-type;date;host, Signature=b105eb10c6d318d2294de9d49dd8b031b55e3c3fe139f2e637da70511e9e7b71' + 'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=content-type;date;host, Signature=b105eb10c6d318d2294de9d49dd8b031b55e3c3fe139f2e637da70511e9e7b71' end end tests('get with relative path') do returns(@signer.sign({:query => {}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/foo/bar/../..'}, @now)) do - 'Aws4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470' + 'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470' end end tests('get with pointless .') do returns(@signer.sign({:query => {}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/./foo'}, @now)) do - 'Aws4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=910e4d6c9abafaf87898e1eb4c929135782ea25bb0279703146455745391e63a' + 'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=910e4d6c9abafaf87898e1eb4c929135782ea25bb0279703146455745391e63a' end end tests('get with repeated / ') do returns(@signer.sign({:query => {}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '//'}, @now)) do - 'Aws4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470' + 'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470' end end tests('get with repeated trailing / ') do returns(@signer.sign({:query => {}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '//foo//'}, @now)) do - 'Aws4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b00392262853cfe3201e47ccf945601079e9b8a7f51ee4c3d9ee4f187aa9bf19' + 'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b00392262853cfe3201e47ccf945601079e9b8a7f51ee4c3d9ee4f187aa9bf19' end end tests('get signature as components') do returns(@signer.signature_parameters({:query => {'a' => 'foo', 'b' => 'foo'}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, @now)) do { - 'X-Amz-Algorithm' => 'Aws4-HMAC-SHA256', + 'X-Amz-Algorithm' => 'AWS4-HMAC-SHA256', 'X-Amz-Credential' => 'AKIDEXAMPLE/20110909/us-east-1/host/aws4_request', 'X-Amz-SignedHeaders' => 'date;host', 'X-Amz-Signature' => 'a6c6304682c74bcaebeeab2fdfb8041bbb39c6976300791a283057bccf333fb2' @@ -74,9 +74,9 @@ Shindo.tests('Aws | signaturev4', ['aws']) do end tests("inject body sha") do - returns(@signer.signature_parameters({:query => {'a' => 'foo', 'b' => 'foo'}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, @now, 'STREAMING-Aws4-HMAC-SHA256-PAYLOAD')) do + returns(@signer.signature_parameters({:query => {'a' => 'foo', 'b' => 'foo'}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, @now, 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD')) do { - 'X-Amz-Algorithm' => 'Aws4-HMAC-SHA256', + 'X-Amz-Algorithm' => 'AWS4-HMAC-SHA256', 'X-Amz-Credential' => 'AKIDEXAMPLE/20110909/us-east-1/host/aws4_request', 'X-Amz-SignedHeaders' => 'date;host', 'X-Amz-Signature' => '22c32bb0d0b859b94839de4e9360bca1806e73d853f5f97ae0d849f0bdf42fb0' diff --git a/tests/signed_params_tests.rb b/tests/signed_params_tests.rb index ed42303ae..64b9a9f90 100644 --- a/tests/signed_params_tests.rb +++ b/tests/signed_params_tests.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -Shindo.tests('Aws | signed_params', ['aws']) do +Shindo.tests('AWS | signed_params', ['aws']) do returns( Fog::AWS.escape( "'Stöp!' said Fred_-~./" ) ) { "%27St%C3%B6p%21%27%20said%20Fred_-~.%2F" } tests('Unicode characters should be escaped') do diff --git a/tests/storage_tests.rb b/tests/storage_tests.rb index f0bb32bec..0f2748dfe 100644 --- a/tests/storage_tests.rb +++ b/tests/storage_tests.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -Shindo.tests('Aws Storage | escape', ['aws']) do +Shindo.tests('AWS Storage | escape', ['aws']) do tests('Keys can contain a hierarchical prefix which should not be escaped') do returns( Fog::Storage::AWS.new.send(:escape, "key/with/prefix") ) { "key/with/prefix" } end