CS-10 bump to 9.0.4.0 which has no troubles with Module.name

stelligent · Feb 19, 2016 · 574e11c · 574e11c
1 parent c780994
commit 574e11c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -35,6 +35,7 @@ GEM
     i18n (0.7.0)
     jmespath (1.1.3)
     json (1.8.3)
+    json (1.8.3-java)
     minitest (5.8.4)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -61,12 +62,14 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tins (1.8.2)
     trollop (2.1.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -78,4 +81,4 @@ DEPENDENCIES
   trollop
 
 BUNDLED WITH
-   1.10.6
+   1.11.2
diff --git a/README.md b/README.md
@@ -0,0 +1,7 @@
+Beware to do your local development against the JRuby specified in pom.xml so you don't get a horrible
+surprise upon deployment to Lambda!
+
+simplecov doesn't play well with JRuby, so you can use Ruby 2.2.x when measuring coverage.
+
+there is a python version that does basically the same thing here:
+https://github.com/awslabs/aws-cloudfront-samples/tree/master/update_security_groups_lambda
diff --git a/awspec/lambda_spec.rb b/awspec/lambda_spec.rb
@@ -1,6 +1,6 @@
 require_relative 'spec_helper'
 
-ENV['CLOUDFRONT_ONLY_SECURITY_GROUP_LAMBDA_FUNCTION_NAME'] = 'g-sgUpdaterLambdaFunction-1AIT730QWM7QZ'
+ENV['CLOUDFRONT_ONLY_SECURITY_GROUP_LAMBDA_FUNCTION_NAME'] = 'CloudFront-Lambda-Security-sgUpdaterLambdaFunction-CQS3T2H2QKZV'
 
 describe lambda(ENV['CLOUDFRONT_ONLY_SECURITY_GROUP_LAMBDA_FUNCTION_NAME']) do
   it { should exist }

diff --git a/cfn/lambda_cfndsl.rb b/cfn/lambda_cfndsl.rb
@@ -11,7 +11,7 @@
     Code({
       'S3Bucket' => 'stelligent-binary-artifact-repo',
       'S3Key' => 'cloudfront-only-security-group-1.0.0-SNAPSHOT.jar',
-      'S3ObjectVersion' => '9IeMc4imZuKP5.dI3kRMnWeR31Stz4An'
+      'S3ObjectVersion' => '_oEoJMIB0aQn7pmiq5dUKmmxhQ0nu4Sz'
     })
   }
 
@@ -52,10 +52,7 @@
             "Statement":[
               {
                 "Action":[
-                  "ec2:AuthorizeSecurityGroupEgress",
-                  "ec2:AuthorizeSecurityGroupIngress",
-                  "ec2:RevokeSecurityGroupEgress",
-                  "ec2:RevokeSecurityGroupIngress"
+                  "ec2:*SecurityGroup*"
                 ],
                 "Effect":"Allow",
                 "Resource":"*"

diff --git a/pom.xml b/pom.xml
@@ -22,11 +22,11 @@
     <version>1.1.0</version>
   </dependency>
 
-  <!-- i think 9.1.0.0 will fix the module name problem -->
+  <!-- don't use 9.0.5.0, the Module.name is emitting rubbish that screws up reflection code for AWS SDK and awspec -->
   <dependency>
     <groupId>org.jruby</groupId>
     <artifactId>jruby</artifactId>
-    <version>1.7.19</version>
+    <version>9.0.4.0</version>
   </dependency>
 
   <dependency>