lucid-cumulus 0.11.20 → 0.11.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (54) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -1
  3. data/Gemfile.lock +45 -520
  4. data/lib/autoscaling/AutoScaling.rb +1 -1
  5. data/lib/autoscaling/manager/Manager.rb +2 -1
  6. data/lib/autoscaling/models/PolicyConfig.rb +1 -1
  7. data/lib/aws_extensions/s3/Bucket.rb +2 -0
  8. data/lib/aws_extensions/s3/BucketCors.rb +1 -1
  9. data/lib/aws_extensions/s3/BucketLifecycle.rb +1 -0
  10. data/lib/aws_extensions/s3/BucketPolicy.rb +1 -1
  11. data/lib/aws_extensions/s3/BucketTagging.rb +2 -0
  12. data/lib/aws_extensions/s3/BucketWebsite.rb +2 -0
  13. data/lib/aws_extensions/s3/CORSRule.rb +0 -1
  14. data/lib/aws_extensions/s3/ReplicationConfiguration.rb +2 -0
  15. data/lib/cloudfront/CloudFront.rb +1 -1
  16. data/lib/cloudfront/manager/Manager.rb +1 -1
  17. data/lib/cloudfront/models/CacheBehaviorConfig.rb +10 -2
  18. data/lib/cloudfront/models/CacheBehaviorDiff.rb +7 -0
  19. data/lib/common/BaseLoader.rb +1 -0
  20. data/lib/conf/Configuration.rb +1 -1
  21. data/lib/ec2/EC2.rb +1 -1
  22. data/lib/ec2/managers/EbsManager.rb +1 -1
  23. data/lib/ec2/managers/InstanceManager.rb +1 -1
  24. data/lib/elb/ELB.rb +1 -1
  25. data/lib/elb/loader/Loader.rb +1 -1
  26. data/lib/elb/manager/Manager.rb +1 -1
  27. data/lib/elb/models/LoadBalancerConfig.rb +1 -0
  28. data/lib/iam/IAM.rb +1 -1
  29. data/lib/iam/manager/IamGroups.rb +1 -1
  30. data/lib/iam/manager/IamRoles.rb +1 -1
  31. data/lib/iam/manager/IamUsers.rb +1 -1
  32. data/lib/iam/manager/Manager.rb +1 -1
  33. data/lib/iam/models/ResourceWithPolicy.rb +1 -0
  34. data/lib/kinesis/Kinesis.rb +1 -1
  35. data/lib/kinesis/manager/Manager.rb +1 -1
  36. data/lib/lambda/Lambda.rb +1 -1
  37. data/lib/route53/manager/Manager.rb +1 -1
  38. data/lib/route53/models/RecordConfig.rb +2 -1
  39. data/lib/s3/S3.rb +1 -1
  40. data/lib/s3/loader/Loader.rb +1 -1
  41. data/lib/s3/manager/Manager.rb +0 -2
  42. data/lib/s3/models/BucketConfig.rb +1 -0
  43. data/lib/security/SecurityGroups.rb +1 -1
  44. data/lib/security/manager/Manager.rb +1 -1
  45. data/lib/sns/SNS.rb +1 -1
  46. data/lib/sqs/SQS.rb +1 -1
  47. data/lib/sqs/loader/Loader.rb +0 -2
  48. data/lib/sqs/manager/Manager.rb +0 -1
  49. data/lib/vpc/loader/Loader.rb +0 -2
  50. data/lib/vpc/manager/Manager.rb +1 -1
  51. data/lib/vpc/models/DhcpConfig.rb +1 -0
  52. data/lucid-cumulus.gemspec +15 -2
  53. data/spec/sqs/SQSUtil.rb +0 -1
  54. metadata +174 -7
@@ -1,6 +1,6 @@
1
1
  require "conf/Configuration"
2
2
 
3
- require "aws-sdk"
3
+ require "aws-sdk-autoscaling"
4
4
 
5
5
  module Cumulus
6
6
  module AutoScaling
@@ -6,7 +6,8 @@ require "autoscaling/models/ScheduledActionDiff"
6
6
  require "common/manager/Manager"
7
7
  require "util/Colors"
8
8
 
9
- require "aws-sdk"
9
+ require "aws-sdk-autoscaling"
10
+ require "aws-sdk-cloudwatch"
10
11
 
11
12
  module Cumulus
12
13
  module AutoScaling
@@ -3,7 +3,7 @@ require "autoscaling/models/AlarmDiff"
3
3
  require "autoscaling/models/PolicyDiff"
4
4
  require "conf/Configuration"
5
5
 
6
- require "aws-sdk"
6
+ require "aws-sdk-cloudwatch"
7
7
 
8
8
  module Cumulus
9
9
  module AutoScaling
@@ -1,6 +1,8 @@
1
1
  require "conf/Configuration"
2
2
  require "s3/S3"
3
3
 
4
+ require "aws-sdk-s3"
5
+
4
6
  module AwsExtensions
5
7
  module S3
6
8
  module Types
@@ -1,4 +1,4 @@
1
- require "aws-sdk"
1
+ require "aws-sdk-s3"
2
2
 
3
3
  module AwsExtensions
4
4
  module S3
@@ -1,4 +1,5 @@
1
1
  require "s3/models/LifecycleConfig"
2
+ require "aws-sdk-s3"
2
3
 
3
4
  module AwsExtensions
4
5
  module S3
@@ -1,4 +1,4 @@
1
- require "aws-sdk"
1
+ require "aws-sdk-s3"
2
2
  require "json"
3
3
  require "deepsort"
4
4
 
@@ -1,3 +1,5 @@
1
+ require "aws-sdk-s3"
2
+
1
3
  module AwsExtensions
2
4
  module S3
3
5
  module BucketTagging
@@ -1,5 +1,7 @@
1
1
  require "s3/models/WebsiteConfig"
2
2
 
3
+ require "aws-sdk-s3"
4
+
3
5
  module AwsExtensions
4
6
  module S3
5
7
  module BucketWebsite
@@ -1,4 +1,3 @@
1
- require "aws-sdk"
2
1
 
3
2
  module AwsExtensions
4
3
  module S3
@@ -1,5 +1,7 @@
1
1
  require "s3/models/ReplicationConfig"
2
2
 
3
+ require "aws-sdk-s3"
4
+
3
5
  module AwsExtensions
4
6
  module S3
5
7
  module ReplicationConfiguration
@@ -1,6 +1,6 @@
1
1
  require "conf/Configuration"
2
2
 
3
- require "aws-sdk"
3
+ require "aws-sdk-cloudfront"
4
4
 
5
5
  module Cumulus
6
6
  module CloudFront
@@ -6,7 +6,7 @@ require "cloudfront/models/DistributionDiff"
6
6
  require "util/Colors"
7
7
  require "util/StatusCodes"
8
8
 
9
- require "aws-sdk"
9
+ require "aws-sdk-cloudfront"
10
10
 
11
11
  module Cumulus
12
12
  module CloudFront
@@ -28,6 +28,7 @@ module Cumulus
28
28
  attr_reader :cached_methods
29
29
  attr_reader :compress
30
30
  attr_reader :lambda_function_associations
31
+ attr_reader :field_level_encryption_id
31
32
 
32
33
  # Public: Constructor
33
34
  #
@@ -53,6 +54,7 @@ module Cumulus
53
54
  @cached_methods = json["cached-methods"] || []
54
55
  @compress = json["compress"] || false
55
56
  @lambda_function_associations = json["lambda_function_associations"] || []
57
+ @field_level_encryption_id = json["field_level_encryption_id"] || ""
56
58
  end
57
59
  end
58
60
 
@@ -75,6 +77,7 @@ module Cumulus
75
77
  @cached_methods = aws.allowed_methods.cached_methods.items
76
78
  @compress = aws.compress
77
79
  @lambda_function_associations = if aws.lambda_function_associations.nil? then [] else aws.lambda_function_associations.items end
80
+ @field_level_encryption_id = aws.field_level_encryption_id
78
81
  end
79
82
 
80
83
  # Public: Get the config as a hash
@@ -98,7 +101,8 @@ module Cumulus
98
101
  "allowed-methods" => @allowed_methods,
99
102
  "cached-methods" => @cached_methods,
100
103
  "compress" => @compress,
101
- "lambda_function_associations" => @lambda_function_associations
104
+ "lambda_function_associations" => @lambda_function_associations,
105
+ "field_level_encryption_id" => @field_level_encryption_id
102
106
  }.reject { |k, v| v.nil? }
103
107
  end
104
108
 
@@ -134,7 +138,8 @@ module Cumulus
134
138
  cached_methods: AwsUtil.aws_array(@cached_methods)
135
139
  },
136
140
  compress: @compress,
137
- lambda_function_associations: AwsUtil.aws_array(@lambda_function_associations)
141
+ lambda_function_associations: AwsUtil.aws_array(@lambda_function_associations),
142
+ field_level_encryption_id: @field_level_encryption_id
138
143
  }
139
144
  end
140
145
 
@@ -244,6 +249,9 @@ module Cumulus
244
249
  diffs << CacheBehaviorDiff.lambda_function_associations(added_assocs, removed_assocs, self)
245
250
  end
246
251
 
252
+ if @field_level_encryption_id != aws.field_level_encryption_id
253
+ diffs << CacheBehaviorDiff.new(CacheBehaviorChange::FIELD_LEVEL_ENCRYPTION_ID, aws, self)
254
+ end
247
255
  diffs
248
256
  end
249
257
 
@@ -26,6 +26,7 @@ module Cumulus
26
26
  METHODS_CACHED = Common::DiffChange::next_change_id
27
27
  COMPRESS = Common::DiffChange::next_change_id
28
28
  LAMBDA_FUNCTION_ASSOCIATIONS = Common::DiffChange::next_change_id
29
+ FIELD_LEVEL_ENCRYPTION_ID = Common::DiffChange::next_change_id
29
30
  end
30
31
 
31
32
  # Public: Represents a single difference between local configuration and AWS
@@ -237,6 +238,12 @@ module Cumulus
237
238
  lambda_function_associations.removed.map { |removed| Colors.removed("\t#{removed}")},
238
239
  lambda_function_associations.added.map { |added| Colors.added("\t#{added}") }
239
240
  ].join("\n")
241
+ when FIELD_LEVEL_ENCRYPTION_ID
242
+ [
243
+ "field level encryption id",
244
+ Colors.aws_changes("\tAWS - #{@aws.field_level_encryption_id}"),
245
+ Colors.local_changes("\tLocal - #{@local.field_level_encryption_id}")
246
+ ].join("\n")
240
247
  end
241
248
  end
242
249
 
@@ -37,6 +37,7 @@ module Cumulus
37
37
  )
38
38
  rescue => e
39
39
  puts "Unable to load resource #{file}: #{e}"
40
+ puts e.backtrace
40
41
  nil
41
42
  end
42
43
  end
@@ -1,5 +1,5 @@
1
1
  require "json"
2
- require "aws-sdk"
2
+ require "aws-sdk-core"
3
3
 
4
4
  module Cumulus
5
5
  # Public: A module that contains helper methods for the configuration classes.
@@ -1,7 +1,7 @@
1
1
  require "conf/Configuration"
2
2
  require "ec2/models/EbsGroupConfig"
3
3
 
4
- require "aws-sdk"
4
+ require "aws-sdk-ec2"
5
5
 
6
6
  module Cumulus
7
7
  module EC2
@@ -6,7 +6,7 @@ require "ec2/models/EbsGroupConfig"
6
6
  require "ec2/models/EbsGroupDiff"
7
7
  require "util/StatusCodes"
8
8
 
9
- require "aws-sdk"
9
+ require "aws-sdk-ec2"
10
10
 
11
11
  module Cumulus
12
12
  module EC2
@@ -8,7 +8,7 @@ require "ec2/models/InstanceDiff"
8
8
  require "iam/IAM"
9
9
  require "util/StatusCodes"
10
10
 
11
- require "aws-sdk"
11
+ require "aws-sdk-ec2"
12
12
  require "base64"
13
13
 
14
14
  module Cumulus
@@ -1,6 +1,6 @@
1
1
  require "conf/Configuration"
2
2
 
3
- require "aws-sdk"
3
+ require "aws-sdk-elasticloadbalancing"
4
4
 
5
5
  module Cumulus
6
6
  module ELB
@@ -3,7 +3,7 @@ require "conf/Configuration"
3
3
  require "elb/models/LoadBalancerConfig"
4
4
  require "elb/models/ListenerConfig"
5
5
 
6
- require "aws-sdk"
6
+ require "aws-sdk-elasticloadbalancing"
7
7
 
8
8
  # Public: Load ELB assets
9
9
  module Cumulus
@@ -6,7 +6,7 @@ require "elb/models/LoadBalancerDiff"
6
6
  require "security/SecurityGroups"
7
7
  require "util/Colors"
8
8
 
9
- require "aws-sdk"
9
+ require "aws-sdk-elasticloadbalancing"
10
10
  require "json"
11
11
 
12
12
  module Cumulus
@@ -9,6 +9,7 @@ require "ec2/EC2"
9
9
  require "security/SecurityGroups"
10
10
 
11
11
  require "json"
12
+ require "aws-sdk-elasticloadbalancing"
12
13
 
13
14
  module Cumulus
14
15
  module ELB
@@ -1,6 +1,6 @@
1
1
  require "conf/Configuration"
2
2
 
3
- require "aws-sdk"
3
+ require "aws-sdk-iam"
4
4
 
5
5
  module Cumulus
6
6
  module IAM
@@ -5,7 +5,7 @@ require "iam/manager/IamResource"
5
5
  require "iam/models/GroupConfig"
6
6
  require "util/Colors"
7
7
 
8
- require "aws-sdk"
8
+ require "aws-sdk-iam"
9
9
 
10
10
  module Cumulus
11
11
  module IAM
@@ -6,7 +6,7 @@ require "iam/models/RoleConfig"
6
6
  require "util/AwsUtil"
7
7
  require "util/Colors"
8
8
 
9
- require "aws-sdk"
9
+ require "aws-sdk-iam"
10
10
 
11
11
  module Cumulus
12
12
  module IAM
@@ -2,7 +2,7 @@ require "iam/loader/Loader"
2
2
  require "iam/manager/IamResource"
3
3
  require "iam/models/UserConfig"
4
4
 
5
- require "aws-sdk"
5
+ require "aws-sdk-iam"
6
6
 
7
7
  module Cumulus
8
8
  module IAM
@@ -3,7 +3,7 @@ require "iam/manager/IamGroups"
3
3
  require "iam/manager/IamRoles"
4
4
  require "iam/manager/IamUsers"
5
5
 
6
- require "aws-sdk"
6
+ require "aws-sdk-iam"
7
7
 
8
8
  module Cumulus
9
9
  module IAM
@@ -8,6 +8,7 @@ require "deepsort"
8
8
  require "aws_extensions/iam/Policy"
9
9
 
10
10
  require "json"
11
+ require "aws-sdk-iam"
11
12
 
12
13
  module Cumulus
13
14
  module IAM
@@ -1,4 +1,4 @@
1
- require "aws-sdk"
1
+ require "aws-sdk-kinesis"
2
2
 
3
3
  module Cumulus
4
4
  module Kinesis
@@ -5,7 +5,7 @@ require "kinesis/loader/Loader"
5
5
  require "kinesis/models/StreamConfig"
6
6
  require "kinesis/models/StreamDiff"
7
7
 
8
- require "aws-sdk"
8
+ require "aws-sdk-kinesis"
9
9
 
10
10
  module Cumulus
11
11
  module Kinesis
@@ -1,6 +1,6 @@
1
1
  require "conf/Configuration"
2
2
 
3
- require "aws-sdk"
3
+ require "aws-sdk-lambda"
4
4
 
5
5
  module Cumulus
6
6
  module Lambda
@@ -6,7 +6,7 @@ require "route53/models/Vpc"
6
6
  require "route53/models/ZoneDiff"
7
7
  require "util/Colors"
8
8
 
9
- require "aws-sdk"
9
+ require "aws-sdk-route53"
10
10
 
11
11
  module Cumulus
12
12
  module Route53
@@ -6,7 +6,8 @@ require "route53/models/AliasTarget"
6
6
  require "route53/models/RecordDiff"
7
7
  require "s3/S3"
8
8
 
9
- require "aws-sdk"
9
+ require "aws-sdk-route53"
10
+ require "aws-sdk-s3"
10
11
 
11
12
  module Cumulus
12
13
  module Route53
@@ -1,6 +1,6 @@
1
1
  require "conf/Configuration"
2
2
 
3
- require "aws-sdk"
3
+ require "aws-sdk-s3"
4
4
 
5
5
  module Cumulus
6
6
  module S3
@@ -3,7 +3,7 @@ require "conf/Configuration"
3
3
  require "s3/models/BucketConfig"
4
4
  require "deepsort"
5
5
 
6
- require "aws-sdk"
6
+ require "aws-sdk-s3"
7
7
 
8
8
  module Cumulus
9
9
  module S3
@@ -6,8 +6,6 @@ require "s3/models/BucketDiff"
6
6
  require "s3/S3"
7
7
  require "util/Colors"
8
8
 
9
- require "aws-sdk"
10
-
11
9
  module Cumulus
12
10
  module S3
13
11
  class Manager < Common::Manager
@@ -25,6 +25,7 @@ require "s3/models/ReplicationDiff"
25
25
  require "s3/models/WebsiteConfig"
26
26
 
27
27
  require "json"
28
+ require "aws-sdk-s3"
28
29
 
29
30
  module Cumulus
30
31
  module S3
@@ -1,7 +1,7 @@
1
1
  require "conf/Configuration"
2
2
  require "ec2/EC2"
3
3
 
4
- require "aws-sdk"
4
+ require "aws-sdk-ec2"
5
5
 
6
6
  module Cumulus
7
7
  module SecurityGroups
@@ -6,7 +6,7 @@ require "security/models/SecurityGroupDiff"
6
6
  require "security/SecurityGroups"
7
7
  require "util/Colors"
8
8
 
9
- require "aws-sdk"
9
+ require "aws-sdk-ec2"
10
10
  require "json"
11
11
 
12
12
  module Cumulus
@@ -1,6 +1,6 @@
1
1
  require "conf/Configuration"
2
2
 
3
- require "aws-sdk"
3
+ require "aws-sdk-sns"
4
4
 
5
5
  module Cumulus
6
6
  module SNS
@@ -1,7 +1,7 @@
1
1
  require "conf/Configuration"
2
2
  require "util/Colors"
3
3
 
4
- require "aws-sdk"
4
+ require "aws-sdk-sqs"
5
5
 
6
6
  module Cumulus
7
7
  module SQS