aws-sdk 1.8.5 → 1.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.yardopts +1 -0
- data/README.rdoc +8 -0
- data/lib/aws-sdk.rb +39 -35
- data/lib/aws/api_config/CloudFront-2012-07-01.yml +2398 -0
- data/lib/aws/api_config/DirectConnect-2012-10-25.yml +475 -0
- data/lib/aws/api_config/DynamoDB-2011-12-05.yml +8 -0
- data/lib/aws/api_config/DynamoDB-2012-08-10.yml +1516 -0
- data/lib/aws/api_config/OpsWorks-2013-02-18.yml +2 -2
- data/lib/aws/auto_scaling.rb +44 -44
- data/lib/aws/auto_scaling/activity.rb +1 -1
- data/lib/aws/auto_scaling/activity_collection.rb +14 -15
- data/lib/aws/auto_scaling/client.rb +277 -277
- data/lib/aws/auto_scaling/config.rb +1 -1
- data/lib/aws/auto_scaling/group.rb +35 -36
- data/lib/aws/auto_scaling/group_collection.rb +10 -10
- data/lib/aws/auto_scaling/group_options.rb +19 -19
- data/lib/aws/auto_scaling/instance.rb +27 -27
- data/lib/aws/auto_scaling/instance_collection.rb +10 -10
- data/lib/aws/auto_scaling/launch_configuration.rb +3 -3
- data/lib/aws/auto_scaling/launch_configuration_collection.rb +1 -1
- data/lib/aws/auto_scaling/notification_configuration.rb +2 -2
- data/lib/aws/auto_scaling/notification_configuration_collection.rb +37 -38
- data/lib/aws/auto_scaling/scaling_policy.rb +3 -3
- data/lib/aws/auto_scaling/scaling_policy_collection.rb +6 -6
- data/lib/aws/auto_scaling/scaling_policy_options.rb +8 -7
- data/lib/aws/auto_scaling/scheduled_action.rb +3 -3
- data/lib/aws/auto_scaling/scheduled_action_collection.rb +28 -28
- data/lib/aws/auto_scaling/tag_collection.rb +30 -28
- data/lib/aws/cloud_formation.rb +95 -94
- data/lib/aws/cloud_formation/client.rb +136 -133
- data/lib/aws/cloud_formation/config.rb +1 -1
- data/lib/aws/cloud_formation/stack.rb +37 -37
- data/lib/aws/cloud_formation/stack_collection.rb +28 -27
- data/lib/aws/cloud_formation/stack_event.rb +9 -11
- data/lib/aws/cloud_formation/stack_output.rb +1 -1
- data/lib/aws/cloud_formation/stack_resource.rb +6 -6
- data/lib/aws/cloud_formation/stack_resource_collection.rb +11 -12
- data/lib/aws/cloud_formation/stack_resource_summary_collection.rb +11 -11
- data/lib/aws/cloud_formation/stack_summary_collection.rb +39 -39
- data/lib/aws/cloud_front.rb +21 -21
- data/lib/aws/cloud_front/client.rb +853 -652
- data/lib/aws/cloud_front/request.rb +3 -0
- data/lib/aws/cloud_search.rb +22 -22
- data/lib/aws/cloud_search/client.rb +322 -315
- data/lib/aws/cloud_search/config.rb +1 -1
- data/lib/aws/cloud_watch.rb +39 -39
- data/lib/aws/cloud_watch/alarm.rb +55 -37
- data/lib/aws/cloud_watch/alarm_collection.rb +18 -18
- data/lib/aws/cloud_watch/alarm_history_item_collection.rb +2 -2
- data/lib/aws/cloud_watch/client.rb +360 -146
- data/lib/aws/cloud_watch/config.rb +1 -1
- data/lib/aws/cloud_watch/metric.rb +15 -15
- data/lib/aws/cloud_watch/metric_alarm_collection.rb +17 -17
- data/lib/aws/cloud_watch/metric_collection.rb +16 -16
- data/lib/aws/cloud_watch/metric_statistics.rb +11 -11
- data/lib/aws/core.rb +243 -225
- data/lib/aws/core/async_handle.rb +13 -13
- data/lib/aws/core/cacheable.rb +14 -15
- data/lib/aws/core/client.rb +40 -15
- data/lib/aws/core/collection.rb +42 -46
- data/lib/aws/core/collection/with_limit_and_next_token.rb +1 -1
- data/lib/aws/core/collection/with_next_token.rb +1 -1
- data/lib/aws/core/configuration.rb +97 -133
- data/lib/aws/core/credential_providers.rb +16 -16
- data/lib/aws/core/data.rb +23 -23
- data/lib/aws/core/http/connection_pool.rb +348 -0
- data/lib/aws/core/http/net_http_handler.rb +17 -26
- data/lib/aws/core/http/patch.rb +102 -0
- data/lib/aws/core/http/request.rb +13 -19
- data/lib/aws/core/http/response.rb +2 -2
- data/lib/aws/core/lazy_error_classes.rb +17 -17
- data/lib/aws/core/log_formatter.rb +70 -104
- data/lib/aws/core/options/json_serializer.rb +1 -1
- data/lib/aws/core/options/validator.rb +4 -4
- data/lib/aws/core/page_result.rb +8 -8
- data/lib/aws/core/policy.rb +49 -49
- data/lib/aws/core/region.rb +72 -0
- data/lib/aws/core/region_collection.rb +106 -0
- data/lib/aws/core/resource.rb +5 -5
- data/lib/aws/core/response.rb +20 -17
- data/lib/aws/core/rest_request_builder.rb +4 -4
- data/lib/aws/core/service_interface.rb +24 -2
- data/lib/aws/core/signature/version_3.rb +2 -2
- data/lib/aws/core/uri_escape.rb +1 -1
- data/lib/aws/core/xml/frame_stack.rb +1 -1
- data/lib/aws/core/xml/grammar.rb +3 -4
- data/lib/aws/core/xml/sax_handlers/libxml.rb +2 -2
- data/lib/aws/core/xml/sax_handlers/nokogiri.rb +3 -3
- data/lib/aws/core/xml/sax_handlers/rexml.rb +5 -5
- data/lib/aws/core/xml/stub.rb +9 -9
- data/lib/aws/data_pipeline.rb +21 -21
- data/lib/aws/data_pipeline/client.rb +189 -133
- data/lib/aws/data_pipeline/config.rb +1 -1
- data/lib/aws/direct_connect.rb +74 -0
- data/lib/aws/direct_connect/client.rb +253 -0
- data/lib/aws/direct_connect/config.rb +18 -0
- data/lib/aws/direct_connect/errors.rb +22 -0
- data/lib/aws/direct_connect/request.rb +27 -0
- data/lib/aws/dynamo_db.rb +71 -69
- data/lib/aws/dynamo_db/attribute_collection.rb +53 -58
- data/lib/aws/dynamo_db/batch_get.rb +23 -23
- data/lib/aws/dynamo_db/batch_write.rb +43 -43
- data/lib/aws/dynamo_db/binary.rb +9 -9
- data/lib/aws/dynamo_db/client.rb +494 -509
- data/lib/aws/dynamo_db/client_base.rb +91 -0
- data/lib/aws/dynamo_db/client_v2.rb +825 -0
- data/lib/aws/dynamo_db/config.rb +1 -1
- data/lib/aws/dynamo_db/item.rb +10 -10
- data/lib/aws/dynamo_db/item_collection.rb +75 -75
- data/lib/aws/dynamo_db/table.rb +85 -85
- data/lib/aws/dynamo_db/table_collection.rb +13 -13
- data/lib/aws/ec2.rb +132 -142
- data/lib/aws/ec2/attachment.rb +31 -36
- data/lib/aws/ec2/attachment_collection.rb +1 -1
- data/lib/aws/ec2/availability_zone.rb +4 -4
- data/lib/aws/ec2/client.rb +2272 -2125
- data/lib/aws/ec2/config.rb +1 -1
- data/lib/aws/ec2/customer_gateway.rb +6 -6
- data/lib/aws/ec2/customer_gateway_collection.rb +6 -6
- data/lib/aws/ec2/dhcp_options.rb +3 -3
- data/lib/aws/ec2/dhcp_options_collection.rb +10 -10
- data/lib/aws/ec2/elastic_ip.rb +15 -15
- data/lib/aws/ec2/elastic_ip_collection.rb +11 -15
- data/lib/aws/ec2/export_task.rb +4 -4
- data/lib/aws/ec2/export_task_collection.rb +11 -11
- data/lib/aws/ec2/filtered_collection.rb +6 -8
- data/lib/aws/ec2/image.rb +46 -40
- data/lib/aws/ec2/image_collection.rb +44 -52
- data/lib/aws/ec2/instance.rb +64 -62
- data/lib/aws/ec2/instance_collection.rb +47 -50
- data/lib/aws/ec2/internet_gateway.rb +6 -6
- data/lib/aws/ec2/internet_gateway/attachment.rb +13 -13
- data/lib/aws/ec2/internet_gateway_collection.rb +3 -3
- data/lib/aws/ec2/key_pair.rb +3 -3
- data/lib/aws/ec2/key_pair_collection.rb +12 -12
- data/lib/aws/ec2/network_acl.rb +39 -39
- data/lib/aws/ec2/network_acl/association.rb +2 -2
- data/lib/aws/ec2/network_acl/entry.rb +22 -22
- data/lib/aws/ec2/network_acl_collection.rb +2 -2
- data/lib/aws/ec2/network_interface.rb +13 -4
- data/lib/aws/ec2/network_interface/attachment.rb +3 -3
- data/lib/aws/ec2/network_interface_collection.rb +5 -5
- data/lib/aws/ec2/permission_collection.rb +1 -1
- data/lib/aws/ec2/region.rb +6 -6
- data/lib/aws/ec2/region_collection.rb +1 -1
- data/lib/aws/ec2/reserved_instances_collection.rb +2 -2
- data/lib/aws/ec2/reserved_instances_offering_collection.rb +2 -2
- data/lib/aws/ec2/resource_tag_collection.rb +5 -5
- data/lib/aws/ec2/route_table.rb +14 -14
- data/lib/aws/ec2/route_table/association.rb +22 -22
- data/lib/aws/ec2/route_table/route.rb +8 -8
- data/lib/aws/ec2/route_table_collection.rb +3 -3
- data/lib/aws/ec2/security_group.rb +39 -41
- data/lib/aws/ec2/security_group_collection.rb +19 -21
- data/lib/aws/ec2/snapshot.rb +3 -3
- data/lib/aws/ec2/snapshot_collection.rb +11 -12
- data/lib/aws/ec2/subnet.rb +2 -2
- data/lib/aws/ec2/subnet_collection.rb +17 -17
- data/lib/aws/ec2/tag_collection.rb +1 -1
- data/lib/aws/ec2/tagged_collection.rb +7 -7
- data/lib/aws/ec2/tagged_item.rb +10 -10
- data/lib/aws/ec2/volume.rb +16 -16
- data/lib/aws/ec2/volume_collection.rb +9 -12
- data/lib/aws/ec2/vpc.rb +6 -6
- data/lib/aws/ec2/vpc_collection.rb +10 -10
- data/lib/aws/ec2/vpn_connection.rb +4 -4
- data/lib/aws/ec2/vpn_connection/telemetry.rb +1 -1
- data/lib/aws/ec2/vpn_connection_collection.rb +6 -6
- data/lib/aws/ec2/vpn_gateway.rb +2 -2
- data/lib/aws/ec2/vpn_gateway_collection.rb +5 -5
- data/lib/aws/elastic_beanstalk.rb +12 -12
- data/lib/aws/elastic_beanstalk/client.rb +376 -368
- data/lib/aws/elastic_beanstalk/config.rb +1 -1
- data/lib/aws/elastic_transcoder.rb +5 -5
- data/lib/aws/elastic_transcoder/client.rb +283 -283
- data/lib/aws/elastic_transcoder/config.rb +1 -1
- data/lib/aws/elasticache.rb +12 -12
- data/lib/aws/elasticache/client.rb +484 -479
- data/lib/aws/elasticache/config.rb +1 -1
- data/lib/aws/elb.rb +23 -23
- data/lib/aws/elb/availability_zone_collection.rb +34 -34
- data/lib/aws/elb/backend_server_policy_collection.rb +24 -24
- data/lib/aws/elb/client.rb +153 -153
- data/lib/aws/elb/config.rb +1 -1
- data/lib/aws/elb/errors.rb +1 -1
- data/lib/aws/elb/instance_collection.rb +20 -25
- data/lib/aws/elb/listener.rb +3 -3
- data/lib/aws/elb/listener_collection.rb +8 -8
- data/lib/aws/elb/load_balancer.rb +15 -16
- data/lib/aws/elb/load_balancer_collection.rb +36 -24
- data/lib/aws/elb/load_balancer_policy.rb +1 -1
- data/lib/aws/elb/load_balancer_policy_collection.rb +5 -5
- data/lib/aws/emr.rb +28 -26
- data/lib/aws/emr/client.rb +165 -149
- data/lib/aws/emr/config.rb +1 -1
- data/lib/aws/emr/instance_group.rb +1 -1
- data/lib/aws/emr/instance_group_collection.rb +1 -1
- data/lib/aws/emr/job_flow.rb +27 -26
- data/lib/aws/emr/job_flow_collection.rb +34 -34
- data/lib/aws/errors.rb +7 -7
- data/lib/aws/glacier.rb +21 -21
- data/lib/aws/glacier/archive_collection.rb +2 -2
- data/lib/aws/glacier/client.rb +139 -140
- data/lib/aws/glacier/config.rb +1 -1
- data/lib/aws/glacier/vault.rb +2 -2
- data/lib/aws/glacier/vault_collection.rb +1 -1
- data/lib/aws/iam.rb +133 -144
- data/lib/aws/iam/access_key.rb +17 -17
- data/lib/aws/iam/access_key_collection.rb +22 -22
- data/lib/aws/iam/account_alias_collection.rb +2 -2
- data/lib/aws/iam/client.rb +429 -420
- data/lib/aws/iam/collection.rb +1 -1
- data/lib/aws/iam/config.rb +2 -2
- data/lib/aws/iam/group.rb +8 -8
- data/lib/aws/iam/group_collection.rb +16 -16
- data/lib/aws/iam/group_policy_collection.rb +6 -6
- data/lib/aws/iam/group_user_collection.rb +3 -3
- data/lib/aws/iam/mfa_device.rb +1 -1
- data/lib/aws/iam/mfa_device_collection.rb +9 -9
- data/lib/aws/iam/policy_collection.rb +4 -4
- data/lib/aws/iam/resource.rb +2 -2
- data/lib/aws/iam/server_certificate.rb +1 -1
- data/lib/aws/iam/server_certificate_collection.rb +15 -15
- data/lib/aws/iam/signing_certificate.rb +29 -29
- data/lib/aws/iam/signing_certificate_collection.rb +23 -23
- data/lib/aws/iam/user.rb +33 -38
- data/lib/aws/iam/user_collection.rb +27 -27
- data/lib/aws/iam/user_group_collection.rb +3 -3
- data/lib/aws/iam/user_policy_collection.rb +6 -6
- data/lib/aws/iam/virtual_mfa_device.rb +12 -12
- data/lib/aws/iam/virtual_mfa_device_collection.rb +4 -4
- data/lib/aws/import_export.rb +22 -21
- data/lib/aws/import_export/client.rb +47 -43
- data/lib/aws/ops_works.rb +5 -5
- data/lib/aws/ops_works/client.rb +484 -438
- data/lib/aws/ops_works/config.rb +1 -1
- data/lib/aws/rails.rb +34 -34
- data/lib/aws/rds.rb +18 -18
- data/lib/aws/rds/client.rb +1286 -1277
- data/lib/aws/rds/config.rb +1 -1
- data/lib/aws/rds/db_instance.rb +15 -4
- data/lib/aws/rds/db_snapshot.rb +1 -1
- data/lib/aws/record.rb +50 -24
- data/lib/aws/record/abstract_base.rb +52 -60
- data/lib/aws/record/attributes.rb +79 -79
- data/lib/aws/record/conversion.rb +1 -1
- data/lib/aws/record/dirty_tracking.rb +69 -67
- data/lib/aws/record/errors.rb +21 -21
- data/lib/aws/record/exceptions.rb +2 -2
- data/lib/aws/record/hash_model.rb +20 -21
- data/lib/aws/record/hash_model/attributes.rb +13 -15
- data/lib/aws/record/hash_model/finder_methods.rb +46 -46
- data/lib/aws/record/hash_model/scope.rb +31 -31
- data/lib/aws/record/model.rb +136 -136
- data/lib/aws/record/model/attributes.rb +57 -59
- data/lib/aws/record/model/finder_methods.rb +67 -67
- data/lib/aws/record/model/scope.rb +48 -49
- data/lib/aws/record/naming.rb +1 -1
- data/lib/aws/record/scope.rb +23 -19
- data/lib/aws/record/validations.rb +253 -271
- data/lib/aws/record/validator.rb +3 -3
- data/lib/aws/record/validators/acceptance.rb +1 -3
- data/lib/aws/record/validators/block.rb +1 -3
- data/lib/aws/record/validators/confirmation.rb +1 -3
- data/lib/aws/record/validators/count.rb +2 -4
- data/lib/aws/record/validators/exclusion.rb +2 -4
- data/lib/aws/record/validators/format.rb +2 -4
- data/lib/aws/record/validators/inclusion.rb +1 -3
- data/lib/aws/record/validators/length.rb +5 -7
- data/lib/aws/record/validators/method.rb +1 -3
- data/lib/aws/record/validators/numericality.rb +6 -8
- data/lib/aws/record/validators/presence.rb +1 -3
- data/lib/aws/redshift.rb +14 -14
- data/lib/aws/redshift/client.rb +596 -592
- data/lib/aws/redshift/config.rb +1 -1
- data/lib/aws/route_53.rb +30 -30
- data/lib/aws/route_53/change_batch.rb +7 -7
- data/lib/aws/route_53/client.rb +188 -152
- data/lib/aws/route_53/hosted_zone.rb +4 -4
- data/lib/aws/route_53/hosted_zone_collection.rb +7 -7
- data/lib/aws/route_53/resource_record_set.rb +10 -10
- data/lib/aws/route_53/resource_record_set_collection.rb +6 -6
- data/lib/aws/s3.rb +79 -79
- data/lib/aws/s3/access_control_list.rb +44 -36
- data/lib/aws/s3/acl_options.rb +51 -51
- data/lib/aws/s3/bucket.rb +146 -146
- data/lib/aws/s3/bucket_collection.rb +21 -21
- data/lib/aws/s3/bucket_lifecycle_configuration.rb +81 -82
- data/lib/aws/s3/bucket_tag_collection.rb +4 -2
- data/lib/aws/s3/cipher_io.rb +5 -4
- data/lib/aws/s3/client.rb +89 -84
- data/lib/aws/s3/client/xml.rb +1 -1
- data/lib/aws/s3/config.rb +7 -1
- data/lib/aws/s3/cors_rule.rb +2 -0
- data/lib/aws/s3/cors_rule_collection.rb +42 -40
- data/lib/aws/s3/data_options.rb +16 -11
- data/lib/aws/s3/encryption_utils.rb +2 -2
- data/lib/aws/s3/errors.rb +7 -7
- data/lib/aws/s3/multipart_upload.rb +30 -33
- data/lib/aws/s3/multipart_upload_collection.rb +8 -6
- data/lib/aws/s3/object_collection.rb +35 -35
- data/lib/aws/s3/object_metadata.rb +6 -6
- data/lib/aws/s3/object_version.rb +4 -4
- data/lib/aws/s3/object_version_collection.rb +15 -15
- data/lib/aws/s3/policy.rb +2 -2
- data/lib/aws/s3/prefixed_collection.rb +9 -5
- data/lib/aws/s3/presigned_post.rb +39 -37
- data/lib/aws/s3/request.rb +11 -11
- data/lib/aws/s3/s3_object.rb +210 -200
- data/lib/aws/s3/tree.rb +25 -27
- data/lib/aws/s3/tree/child_collection.rb +3 -3
- data/lib/aws/s3/tree/leaf_node.rb +2 -2
- data/lib/aws/s3/tree/parent.rb +1 -1
- data/lib/aws/s3/website_configuration.rb +13 -13
- data/lib/aws/simple_db.rb +83 -83
- data/lib/aws/simple_db/attribute.rb +9 -7
- data/lib/aws/simple_db/attribute_collection.rb +22 -13
- data/lib/aws/simple_db/client.rb +107 -107
- data/lib/aws/simple_db/config.rb +7 -1
- data/lib/aws/simple_db/consistent_read_option.rb +5 -5
- data/lib/aws/simple_db/domain.rb +4 -2
- data/lib/aws/simple_db/domain_collection.rb +4 -4
- data/lib/aws/simple_db/domain_metadata.rb +5 -5
- data/lib/aws/simple_db/errors.rb +9 -9
- data/lib/aws/simple_db/item.rb +5 -5
- data/lib/aws/simple_db/item_collection.rb +83 -81
- data/lib/aws/simple_db/item_data.rb +4 -4
- data/lib/aws/simple_db/put_attributes.rb +3 -3
- data/lib/aws/simple_email_service.rb +140 -140
- data/lib/aws/simple_email_service/client.rb +82 -76
- data/lib/aws/simple_email_service/config.rb +1 -2
- data/lib/aws/simple_email_service/email_address_collection.rb +3 -3
- data/lib/aws/simple_email_service/identity.rb +8 -8
- data/lib/aws/simple_email_service/quotas.rb +8 -6
- data/lib/aws/simple_workflow.rb +106 -106
- data/lib/aws/simple_workflow/activity_task.rb +15 -22
- data/lib/aws/simple_workflow/activity_task_collection.rb +15 -15
- data/lib/aws/simple_workflow/activity_type.rb +23 -23
- data/lib/aws/simple_workflow/activity_type_collection.rb +23 -23
- data/lib/aws/simple_workflow/client.rb +1004 -956
- data/lib/aws/simple_workflow/config.rb +1 -1
- data/lib/aws/simple_workflow/count.rb +5 -5
- data/lib/aws/simple_workflow/decision_task.rb +129 -129
- data/lib/aws/simple_workflow/decision_task_collection.rb +59 -59
- data/lib/aws/simple_workflow/domain.rb +11 -11
- data/lib/aws/simple_workflow/domain_collection.rb +26 -26
- data/lib/aws/simple_workflow/history_event.rb +32 -32
- data/lib/aws/simple_workflow/history_event_collection.rb +3 -3
- data/lib/aws/simple_workflow/option_formatters.rb +5 -5
- data/lib/aws/simple_workflow/request.rb +1 -1
- data/lib/aws/simple_workflow/resource.rb +1 -1
- data/lib/aws/simple_workflow/type.rb +8 -8
- data/lib/aws/simple_workflow/type_collection.rb +15 -15
- data/lib/aws/simple_workflow/workflow_execution.rb +70 -72
- data/lib/aws/simple_workflow/workflow_execution_collection.rb +130 -130
- data/lib/aws/simple_workflow/workflow_type.rb +27 -25
- data/lib/aws/simple_workflow/workflow_type_collection.rb +20 -20
- data/lib/aws/sns.rb +25 -25
- data/lib/aws/sns/client.rb +55 -55
- data/lib/aws/sns/config.rb +1 -1
- data/lib/aws/sns/policy.rb +1 -1
- data/lib/aws/sns/subscription.rb +7 -7
- data/lib/aws/sns/subscription_collection.rb +5 -5
- data/lib/aws/sns/topic.rb +49 -49
- data/lib/aws/sns/topic_collection.rb +2 -2
- data/lib/aws/sns/topic_subscription_collection.rb +5 -5
- data/lib/aws/sqs.rb +20 -20
- data/lib/aws/sqs/client.rb +78 -78
- data/lib/aws/sqs/config.rb +1 -1
- data/lib/aws/sqs/errors.rb +12 -12
- data/lib/aws/sqs/queue.rb +66 -67
- data/lib/aws/sqs/queue_collection.rb +16 -8
- data/lib/aws/sqs/received_message.rb +7 -6
- data/lib/aws/storage_gateway.rb +21 -21
- data/lib/aws/storage_gateway/client.rb +269 -202
- data/lib/aws/storage_gateway/config.rb +1 -1
- data/lib/aws/sts.rb +10 -8
- data/lib/aws/sts/client.rb +35 -35
- data/lib/aws/sts/session.rb +3 -3
- data/lib/aws/version.rb +1 -2
- metadata +23 -21
- data/lib/aws/core/autoloader.rb +0 -64
- data/lib/net/http/connection_pool.rb +0 -226
- data/lib/net/http/connection_pool/connection.rb +0 -189
- data/lib/net/http/connection_pool/session.rb +0 -126
@@ -29,7 +29,7 @@ module AWS
|
|
29
29
|
attr_reader :internet_gateway_id
|
30
30
|
|
31
31
|
alias_method :id, :internet_gateway_id
|
32
|
-
|
32
|
+
|
33
33
|
attribute :vpc_id
|
34
34
|
|
35
35
|
attribute :attachment_set
|
@@ -37,7 +37,7 @@ module AWS
|
|
37
37
|
protected :attachment_set
|
38
38
|
|
39
39
|
populates_from(:describe_internet_gateways) do |resp|
|
40
|
-
resp.internet_gateway_set.find do |gateway|
|
40
|
+
resp.internet_gateway_set.find do |gateway|
|
41
41
|
gateway.internet_gateway_id == internet_gateway_id
|
42
42
|
end
|
43
43
|
end
|
@@ -50,7 +50,7 @@ module AWS
|
|
50
50
|
# @return [VPC,nil] Returns the currently attached VPC, or nil
|
51
51
|
# if this gateway has not been attached.
|
52
52
|
def vpc
|
53
|
-
if attachment = attachments.first
|
53
|
+
if attachment = attachments.first
|
54
54
|
attachment.vpc
|
55
55
|
end
|
56
56
|
end
|
@@ -58,10 +58,10 @@ module AWS
|
|
58
58
|
# Attaches this internet gateway to the given VPC. If this
|
59
59
|
# gateway is already attached to a different VPC, it will
|
60
60
|
# be detached from that one first. If you pass nil, then
|
61
|
-
# this internet gateway will
|
61
|
+
# this internet gateway will
|
62
|
+
#
|
63
|
+
# internet_gateway.vpc = 'vpc-123'
|
62
64
|
#
|
63
|
-
# internet_gateway.vpc = 'vpc-123'
|
64
|
-
#
|
65
65
|
# @param [VPC,String] vpc A {VPC} object or a vpc id string.
|
66
66
|
#
|
67
67
|
def vpc= vpc
|
@@ -17,35 +17,35 @@ module AWS
|
|
17
17
|
|
18
18
|
# Represents the attachment between an internet gateway and a VPC.
|
19
19
|
#
|
20
|
-
#
|
20
|
+
# ## Creating Attachments
|
21
21
|
#
|
22
22
|
# To create an attachment, just assign an internet gateway to a VPC
|
23
23
|
# or visa versa.
|
24
24
|
#
|
25
|
-
#
|
26
|
-
#
|
25
|
+
# # attaches a gateway to a vpc
|
26
|
+
# internet_gateway.vpc = vpc
|
27
27
|
#
|
28
|
-
#
|
29
|
-
#
|
28
|
+
# # this can also be done in reverse
|
29
|
+
# vpc.internet_gateway = internet_gateway
|
30
30
|
#
|
31
|
-
#
|
31
|
+
# ## Enumerating Attachments
|
32
32
|
#
|
33
33
|
# You can enumerate the attachments for an {InternetGateway} like so:
|
34
34
|
#
|
35
|
-
#
|
36
|
-
#
|
37
|
-
#
|
35
|
+
# internet_gateway.attachments.each do |attachment|
|
36
|
+
# puts "#{attachment.internet_gateway.id} => #{attachment.vpc.id}"
|
37
|
+
# end
|
38
38
|
#
|
39
|
-
#
|
39
|
+
# ## Deleting Attachments
|
40
40
|
#
|
41
41
|
# You can delete an attachment from the Attachment object:
|
42
42
|
#
|
43
|
-
#
|
43
|
+
# internet_gateway.attachments.each(&:delete)
|
44
44
|
#
|
45
45
|
# You can also delete an attachment by assigning a nil value:
|
46
46
|
#
|
47
|
-
#
|
48
|
-
#
|
47
|
+
# # removes the current attachment to the vpc is one exists
|
48
|
+
# internet_gateway.vpc = nil
|
49
49
|
#
|
50
50
|
class Attachment
|
51
51
|
|
@@ -19,14 +19,14 @@ module AWS
|
|
19
19
|
include TaggedCollection
|
20
20
|
include Core::Collection::Simple
|
21
21
|
|
22
|
-
# Creates a new Internet gateway in your AWS account. After creating
|
22
|
+
# Creates a new Internet gateway in your AWS account. After creating
|
23
23
|
# the gateway you can attach it to a VPC.
|
24
24
|
#
|
25
25
|
# @return [InternetGateway]
|
26
26
|
#
|
27
27
|
def create
|
28
28
|
response = client.create_internet_gateway
|
29
|
-
self[response.internet_gateway.internet_gateway_id]
|
29
|
+
self[response.internet_gateway.internet_gateway_id]
|
30
30
|
end
|
31
31
|
|
32
32
|
# @param [String] internet_gateway_id
|
@@ -41,7 +41,7 @@ module AWS
|
|
41
41
|
response = filtered_request(:describe_internet_gateways, options, &block)
|
42
42
|
response.internet_gateway_set.each do |g|
|
43
43
|
|
44
|
-
gateway = InternetGateway.new_from(:describe_internet_gateways, g,
|
44
|
+
gateway = InternetGateway.new_from(:describe_internet_gateways, g,
|
45
45
|
g.internet_gateway_id, :config => config)
|
46
46
|
|
47
47
|
yield(gateway)
|
data/lib/aws/ec2/key_pair.rb
CHANGED
@@ -15,7 +15,7 @@ module AWS
|
|
15
15
|
class EC2
|
16
16
|
|
17
17
|
# Represents an EC2 key pair.
|
18
|
-
# @attr_reader [String] fingerprint A SHA-1 digest of the DER encoded
|
18
|
+
# @attr_reader [String] fingerprint A SHA-1 digest of the DER encoded
|
19
19
|
# private key
|
20
20
|
class KeyPair < Resource
|
21
21
|
|
@@ -48,7 +48,7 @@ module AWS
|
|
48
48
|
|
49
49
|
# Returns the private key. Raises an exception if called
|
50
50
|
# against an existing key. You can only get the private key
|
51
|
-
# at the time of creation.
|
51
|
+
# at the time of creation.
|
52
52
|
#
|
53
53
|
# @see KeyPairCollection#import
|
54
54
|
# @note Only call this method on newly created keys.
|
@@ -63,7 +63,7 @@ module AWS
|
|
63
63
|
# Deletes this key pair from EC2.
|
64
64
|
# @return [true]
|
65
65
|
def delete
|
66
|
-
client.delete_key_pair(:key_name => name)
|
66
|
+
client.delete_key_pair(:key_name => name)
|
67
67
|
true
|
68
68
|
end
|
69
69
|
|
@@ -27,28 +27,28 @@ module AWS
|
|
27
27
|
create_or_import(:create_key_pair, :key_name => key_name)
|
28
28
|
end
|
29
29
|
|
30
|
-
# Imports the public key from an RSA key pair that you created with
|
31
|
-
# a third-party tool. Compare this with {#create}, in which EC2
|
32
|
-
# creates the key pair and gives the keys to you (EC2 keeps a copy
|
33
|
-
# of the public key). With ImportKeyPair, you create the key pair
|
34
|
-
# and give EC2 just the public key. The private key is never
|
30
|
+
# Imports the public key from an RSA key pair that you created with
|
31
|
+
# a third-party tool. Compare this with {#create}, in which EC2
|
32
|
+
# creates the key pair and gives the keys to you (EC2 keeps a copy
|
33
|
+
# of the public key). With ImportKeyPair, you create the key pair
|
34
|
+
# and give EC2 just the public key. The private key is never
|
35
35
|
# transferred between you and EC2.
|
36
|
-
#
|
37
|
-
# === Supported formats:
|
38
36
|
#
|
39
|
-
#
|
40
|
-
#
|
41
|
-
# *
|
37
|
+
# ### Supported formats:
|
38
|
+
#
|
39
|
+
# * OpenSSH public key format (e.g., the format in
|
40
|
+
# ~/.ssh/authorized_keys)
|
41
|
+
# * Base64 encoded DER format
|
42
42
|
# * SSH public key file format as specified in RFC4716
|
43
43
|
#
|
44
|
-
# DSA keys are *not* supported. Make sure your key generator is
|
44
|
+
# DSA keys are *not* supported. Make sure your key generator is
|
45
45
|
# set up to create RSA keys. Supported lengths: 1024, 2048, and 4096.
|
46
46
|
#
|
47
47
|
# @param [String] key_name A name for this key pair.
|
48
48
|
# @param [String] public_key The RSA public key.
|
49
49
|
# @return [KeyPair] Returns a new key pair.
|
50
50
|
def import key_name, public_key
|
51
|
-
create_or_import(:import_key_pair,
|
51
|
+
create_or_import(:import_key_pair,
|
52
52
|
:key_name => key_name,
|
53
53
|
:public_key_material => Base64.encode64(public_key.to_s))
|
54
54
|
end
|
data/lib/aws/ec2/network_acl.rb
CHANGED
@@ -21,7 +21,7 @@ module AWS
|
|
21
21
|
#
|
22
22
|
# @attr_reader [String] vpc_id
|
23
23
|
#
|
24
|
-
# @attr_reader [Boolean] default Returns true if this is the default
|
24
|
+
# @attr_reader [Boolean] default Returns true if this is the default
|
25
25
|
# network ACL.
|
26
26
|
#
|
27
27
|
class NetworkACL < Resource
|
@@ -65,27 +65,27 @@ module AWS
|
|
65
65
|
VPC.new(vpc_id, :config => config)
|
66
66
|
end
|
67
67
|
|
68
|
-
# @return [Array<Subnet>] Returns an array of subnets ({Subnet})
|
68
|
+
# @return [Array<Subnet>] Returns an array of subnets ({Subnet})
|
69
69
|
# that currently use this network ACL.
|
70
70
|
def subnets
|
71
71
|
associations.map(&:subnet)
|
72
72
|
end
|
73
73
|
|
74
|
-
# @return [Array<NetworkACL::Association>] Returns an array of
|
74
|
+
# @return [Array<NetworkACL::Association>] Returns an array of
|
75
75
|
# {NetworkACL::Association} objects (association to subnets).
|
76
76
|
def associations
|
77
77
|
association_set.map do |assoc|
|
78
78
|
|
79
|
-
subnet = Subnet.new(assoc.subnet_id,
|
80
|
-
:vpc_id => vpc_id,
|
79
|
+
subnet = Subnet.new(assoc.subnet_id,
|
80
|
+
:vpc_id => vpc_id,
|
81
81
|
:config => config)
|
82
82
|
|
83
83
|
Association.new(assoc.network_acl_association_id, self, subnet)
|
84
|
-
|
84
|
+
|
85
85
|
end
|
86
86
|
end
|
87
87
|
|
88
|
-
# @return [Array<NetworkACL::Entry>] Returns an array of
|
88
|
+
# @return [Array<NetworkACL::Entry>] Returns an array of
|
89
89
|
# all entries for this network ACL.
|
90
90
|
def entries
|
91
91
|
entry_set.map do |entry_details|
|
@@ -97,34 +97,34 @@ module AWS
|
|
97
97
|
#
|
98
98
|
# @param [Hash] options
|
99
99
|
#
|
100
|
-
# @option options [required,Integer] :rule_number Rule number to
|
101
|
-
# assign to the entry (e.g., 100). ACL entries are processed in
|
100
|
+
# @option options [required,Integer] :rule_number Rule number to
|
101
|
+
# assign to the entry (e.g., 100). ACL entries are processed in
|
102
102
|
# ascending order by rule number.
|
103
103
|
#
|
104
|
-
# @option options [required,:allow,:deny] :action Whether to
|
104
|
+
# @option options [required,:allow,:deny] :action Whether to
|
105
105
|
# allow or deny traffic that matches the rule.
|
106
106
|
#
|
107
|
-
# @option options [required,Integer] :protocol IP protocol the rule
|
108
|
-
# applies to. You can use -1 to mean all protocols. You can see a
|
109
|
-
# list of # supported protocol numbers here:
|
107
|
+
# @option options [required,Integer] :protocol IP protocol the rule
|
108
|
+
# applies to. You can use -1 to mean all protocols. You can see a
|
109
|
+
# list of # supported protocol numbers here:
|
110
110
|
# http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
|
111
111
|
#
|
112
|
-
# @option options [required,String] :cidr_block The CIDR range to
|
112
|
+
# @option options [required,String] :cidr_block The CIDR range to
|
113
113
|
# allow or deny, in CIDR notation (e.g., 172.16.0.0/24).
|
114
114
|
#
|
115
|
-
# @option options [Boolean] :egress (false)
|
116
|
-
# Whether this rule applies to egress traffic from the subnet (true)
|
115
|
+
# @option options [Boolean] :egress (false)
|
116
|
+
# Whether this rule applies to egress traffic from the subnet (true)
|
117
117
|
# or ingress traffic to the subnet (false).
|
118
118
|
#
|
119
119
|
# @option options [Range<Integer>] :port_range A numeric range
|
120
|
-
# of ports. Required if specifying TCP (6) or UDP (17) for the
|
120
|
+
# of ports. Required if specifying TCP (6) or UDP (17) for the
|
121
121
|
# :protocol.
|
122
122
|
#
|
123
|
-
# @option options [Integer] :icmp_code For the ICMP protocol, the
|
124
|
-
# ICMP code. You can use -1 to specify all ICMP codes for the given
|
123
|
+
# @option options [Integer] :icmp_code For the ICMP protocol, the
|
124
|
+
# ICMP code. You can use -1 to specify all ICMP codes for the given
|
125
125
|
# ICMP type.
|
126
126
|
#
|
127
|
-
# @option options [Integer] :icmp_type For the ICMP protocol,
|
127
|
+
# @option options [Integer] :icmp_type For the ICMP protocol,
|
128
128
|
# the ICMP type. You can use -1 to specify all ICMP types.
|
129
129
|
#
|
130
130
|
# @return [nil]
|
@@ -138,34 +138,34 @@ module AWS
|
|
138
138
|
#
|
139
139
|
# @param [Hash] options
|
140
140
|
#
|
141
|
-
# @option options [required,Integer] :rule_number Rule number to
|
142
|
-
# assign to the entry (e.g., 100). ACL entries are processed in
|
141
|
+
# @option options [required,Integer] :rule_number Rule number to
|
142
|
+
# assign to the entry (e.g., 100). ACL entries are processed in
|
143
143
|
# ascending order by rule number.
|
144
144
|
#
|
145
|
-
# @option options [required,:allow,:deny] :action Whether to
|
145
|
+
# @option options [required,:allow,:deny] :action Whether to
|
146
146
|
# allow or deny traffic that matches the rule.
|
147
147
|
#
|
148
|
-
# @option options [required,Integer] :protocol IP protocol the rule
|
149
|
-
# applies to. You can use -1 to mean all protocols. You can see a
|
150
|
-
# list of # supported protocol numbers here:
|
148
|
+
# @option options [required,Integer] :protocol IP protocol the rule
|
149
|
+
# applies to. You can use -1 to mean all protocols. You can see a
|
150
|
+
# list of # supported protocol numbers here:
|
151
151
|
# http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
|
152
152
|
#
|
153
|
-
# @option options [required,String] :cidr_block The CIDR range to
|
153
|
+
# @option options [required,String] :cidr_block The CIDR range to
|
154
154
|
# allow or deny, in CIDR notation (e.g., 172.16.0.0/24).
|
155
155
|
#
|
156
|
-
# @option options [Boolean] :egress (false)
|
157
|
-
# Whether this rule applies to egress traffic from the subnet (true)
|
156
|
+
# @option options [Boolean] :egress (false)
|
157
|
+
# Whether this rule applies to egress traffic from the subnet (true)
|
158
158
|
# or ingress traffic to the subnet (false).
|
159
159
|
#
|
160
160
|
# @option options [Range<Integer>] :port_range A numeric range
|
161
|
-
# of ports. Required if specifying TCP (6) or UDP (17) for the
|
161
|
+
# of ports. Required if specifying TCP (6) or UDP (17) for the
|
162
162
|
# :protocol.
|
163
163
|
#
|
164
|
-
# @option options [Integer] :icmp_code For the ICMP protocol, the
|
165
|
-
# ICMP code. You can use -1 to specify all ICMP codes for the given
|
164
|
+
# @option options [Integer] :icmp_code For the ICMP protocol, the
|
165
|
+
# ICMP code. You can use -1 to specify all ICMP codes for the given
|
166
166
|
# ICMP type.
|
167
167
|
#
|
168
|
-
# @option options [Integer] :icmp_type For the ICMP protocol,
|
168
|
+
# @option options [Integer] :icmp_type For the ICMP protocol,
|
169
169
|
# the ICMP type. You can use -1 to specify all ICMP types.
|
170
170
|
#
|
171
171
|
# @return [nil]
|
@@ -178,12 +178,12 @@ module AWS
|
|
178
178
|
# Deletes an entry from this network ACL. To delete an entry
|
179
179
|
# you need to know its rule number and if it is an egress or ingress
|
180
180
|
# rule.
|
181
|
-
#
|
182
|
-
# # delete ingress rule 10
|
183
|
-
# network_acl.delete_entry :egress, 10
|
184
181
|
#
|
185
|
-
#
|
186
|
-
#
|
182
|
+
# # delete ingress rule 10
|
183
|
+
# network_acl.delete_entry :egress, 10
|
184
|
+
#
|
185
|
+
# # delete egress rules 5
|
186
|
+
# network_acl.delete_entry :ingress, 5
|
187
187
|
#
|
188
188
|
# @param [:ingress,:egress] egress_or_ingress Specifies if you want to
|
189
189
|
# delete an ingress or an egress rule.
|
@@ -219,7 +219,7 @@ module AWS
|
|
219
219
|
end
|
220
220
|
|
221
221
|
protected
|
222
|
-
|
222
|
+
|
223
223
|
def entry_options options
|
224
224
|
|
225
225
|
unless [true,false].include?(options[:egress])
|
@@ -24,7 +24,7 @@ module AWS
|
|
24
24
|
@subnet = subnet
|
25
25
|
end
|
26
26
|
|
27
|
-
# @return [String] An identifier representing the association
|
27
|
+
# @return [String] An identifier representing the association
|
28
28
|
# between the network ACL and subnet.
|
29
29
|
attr_reader :association_id
|
30
30
|
|
@@ -34,7 +34,7 @@ module AWS
|
|
34
34
|
# @return [Subnet]
|
35
35
|
attr_reader :subnet
|
36
36
|
|
37
|
-
# Replaces the network acl in the current association with a
|
37
|
+
# Replaces the network acl in the current association with a
|
38
38
|
# different one (a new network acl is assigned to the subnet).
|
39
39
|
#
|
40
40
|
# @param [NetworkACL,String] network_acl A {NetworkACL} object or
|
@@ -14,7 +14,7 @@
|
|
14
14
|
module AWS
|
15
15
|
class EC2
|
16
16
|
class NetworkACL < Resource
|
17
|
-
|
17
|
+
|
18
18
|
# Represents a single entry (rule) for an EC2 network ACL.
|
19
19
|
class Entry
|
20
20
|
|
@@ -41,36 +41,36 @@ module AWS
|
|
41
41
|
# @return [Integer]
|
42
42
|
attr_reader :rule_number
|
43
43
|
|
44
|
-
# @return [Integer] Returns the protocol number. A value of -1
|
45
|
-
# means all protocols. See
|
46
|
-
# http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
|
44
|
+
# @return [Integer] Returns the protocol number. A value of -1
|
45
|
+
# means all protocols. See
|
46
|
+
# http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
|
47
47
|
# for a list of protocol numbers to names.
|
48
48
|
attr_reader :protocol
|
49
49
|
|
50
|
-
# @return [:allow,:deny] Whether to allow or deny the traffic that
|
50
|
+
# @return [:allow,:deny] Whether to allow or deny the traffic that
|
51
51
|
# matches the rule.
|
52
52
|
attr_reader :action
|
53
53
|
|
54
|
-
# @return [Boolean] Indicate the rule is an egress rule (rule is
|
54
|
+
# @return [Boolean] Indicate the rule is an egress rule (rule is
|
55
55
|
# applied to traffic leaving the subnet).
|
56
56
|
attr_reader :egress
|
57
57
|
|
58
|
-
# @return [Boolean] Indicate the rule is an ingress rule (rule is
|
58
|
+
# @return [Boolean] Indicate the rule is an ingress rule (rule is
|
59
59
|
# applied to traffic entering the subnet).
|
60
60
|
attr_reader :ingress
|
61
61
|
|
62
62
|
# @return [String] The network range to allow or deny, in CIDR notation.
|
63
63
|
attr_reader :cidr_block
|
64
64
|
|
65
|
-
# @return [nil,Range<Integer>] For the TCP or UDP protocols, the range
|
65
|
+
# @return [nil,Range<Integer>] For the TCP or UDP protocols, the range
|
66
66
|
# of ports the rule applies to.
|
67
67
|
attr_reader :port_range
|
68
68
|
|
69
|
-
# @return [nil,Integer] A value of -1 means all codes for the given
|
69
|
+
# @return [nil,Integer] A value of -1 means all codes for the given
|
70
70
|
# ICMP type. Returns nil unless the protocol is ICMP.
|
71
71
|
attr_reader :icmp_code
|
72
72
|
|
73
|
-
# @return [nil,Integer] A value of -1 means all codes for the given
|
73
|
+
# @return [nil,Integer] A value of -1 means all codes for the given
|
74
74
|
# ICMP type. Returns nil unless the protocol is ICMP.
|
75
75
|
attr_reader :icmp_type
|
76
76
|
|
@@ -85,7 +85,7 @@ module AWS
|
|
85
85
|
def deny?
|
86
86
|
@action == :deny
|
87
87
|
end
|
88
|
-
|
88
|
+
|
89
89
|
# @return [Boolean] Returns true if the rule is applied to traffic
|
90
90
|
# entering the subnet.
|
91
91
|
def ingress?
|
@@ -102,30 +102,30 @@ module AWS
|
|
102
102
|
#
|
103
103
|
# @param [Hash] options
|
104
104
|
#
|
105
|
-
# @option options [required,:allow,:deny] :rule_action Whether to
|
105
|
+
# @option options [required,:allow,:deny] :rule_action Whether to
|
106
106
|
# allow or deny traffic that matches the rule.
|
107
107
|
#
|
108
|
-
# @option options [required,Integer] :protocol IP protocol the rule
|
109
|
-
# applies to. You can use -1 to mean all protocols. You can see a
|
110
|
-
# list of # supported protocol numbers here:
|
108
|
+
# @option options [required,Integer] :protocol IP protocol the rule
|
109
|
+
# applies to. You can use -1 to mean all protocols. You can see a
|
110
|
+
# list of # supported protocol numbers here:
|
111
111
|
# http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
|
112
112
|
#
|
113
|
-
# @option options [required,String] :cidr_block The CIDR range to
|
113
|
+
# @option options [required,String] :cidr_block The CIDR range to
|
114
114
|
# allow or deny, in CIDR notation (e.g., 172.16.0.0/24).
|
115
115
|
#
|
116
|
-
# @option options [Boolean] :egress (false)
|
117
|
-
# Whether this rule applies to egress traffic from the subnet (true)
|
116
|
+
# @option options [Boolean] :egress (false)
|
117
|
+
# Whether this rule applies to egress traffic from the subnet (true)
|
118
118
|
# or ingress traffic to the subnet (false).
|
119
119
|
#
|
120
120
|
# @option options [Range<Integer>] :port_range A numeric range
|
121
|
-
# of ports. Required if specifying TCP (6) or UDP (17) for the
|
121
|
+
# of ports. Required if specifying TCP (6) or UDP (17) for the
|
122
122
|
# :protocol.
|
123
123
|
#
|
124
|
-
# @option options [Integer] :icmp_code For the ICMP protocol, the
|
125
|
-
# ICMP code. You can use -1 to specify all ICMP codes for the given
|
124
|
+
# @option options [Integer] :icmp_code For the ICMP protocol, the
|
125
|
+
# ICMP code. You can use -1 to specify all ICMP codes for the given
|
126
126
|
# ICMP type.
|
127
127
|
#
|
128
|
-
# @option options [Integer] :icmp_type For the ICMP protocol,
|
128
|
+
# @option options [Integer] :icmp_type For the ICMP protocol,
|
129
129
|
# the ICMP type. You can use -1 to specify all ICMP types.
|
130
130
|
#
|
131
131
|
# @return [nil]
|