kms_encrypted 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 844c888ff1036e25341d665534193770b363f2d1
-  data.tar.gz: 042e30c929e4db3e7d7c18d692cc78ce220932c7
+  metadata.gz: 4319f0f40f5294c89119d36ebaba64696eb9abeb
+  data.tar.gz: 46933afe998badcf3b95814e0d9c1144f432d822
 SHA512:
-  metadata.gz: 14e1be577cf7639c7f4eea48f1b03a56315adcd82d6efc4d38ecf6662793947202c4ded1f0d674eb860b60da4e8081a65515949a3810384c6c7b91d666d8bc9a
-  data.tar.gz: 359927d6b27361c62434e49be3b1a90d9498119d73a5f098f903eadbad4afef3a879bb61ee19d8f8d41753a91e11cbe461a4b79a307d6a4b06238a5908a9cbea
+  metadata.gz: 2ca6b3da8040d329ee3a4bac21e0a06e82c9c423fed259e62508dd92332196eac46034d3803760baffc3c312a7618594fd1c0caefe7b25ebc8b57305e176501d
+  data.tar.gz: 56520a00ea21504b321e6e93f8f43283cd37a1b75d84661cb4e2a85d2ead8dda11062eb307bb8b4258c26ebdc3b0fcad017d335e9e9471314e0f393e69632f50

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.2
+
+- Use `KMS_KEY_ID` env variable by default
+
 ## 0.1.1
 
 - Added key rotation

data/README.md

@@ -33,7 +33,7 @@ Add a column to store encrypted KMS data keys
 add_column :users, :encrypted_kms_key, :string
 ```
 
-Create a [KMS master key](https://console.aws.amazon.com/iam/home#/encryptionKeys) and set it in your environment (we recommend [dotenv](https://github.com/bkeepers/dotenv))
+Create a [KMS master key](https://console.aws.amazon.com/iam/home#/encryptionKeys) and set it in your environment ([dotenv](https://github.com/bkeepers/dotenv) is great for this)
 
 ```sh
 KMS_KEY_ID=arn:aws:kms:...
@@ -43,7 +43,7 @@ And update your model
 
 ```ruby
 class User < ApplicationRecord
-  has_kms_key ENV["KMS_KEY_ID"]
+  has_kms_key
 
   attr_encrypted :email, key: :kms_key
 end
@@ -78,7 +78,7 @@ class User < ApplicationRecord
 end
 ```
 
-We recommend [Amazon Athena](https://aws.amazon.com/athena/) for querying CloudTrail logs. Create a table (thanks to [this post](http://www.1strategy.com/blog/2017/07/25/auditing-aws-activity-with-cloudtrail-and-athena/) for the table structure) with:
+[Amazon Athena](https://aws.amazon.com/athena/) is great for querying CloudTrail logs. Create a table (thanks to [this post](http://www.1strategy.com/blog/2017/07/25/auditing-aws-activity-with-cloudtrail-and-athena/) for the table structure) with:
 
 ```sql
 CREATE EXTERNAL TABLE cloudtrail_logs (
@@ -159,7 +159,7 @@ KMS_KEY_ID=arn:aws:kms:...
 
 and run
 
-```sh
+```ruby
 User.find_each do |user|
   user.rotate_kms_key!
 end
@@ -179,8 +179,8 @@ And update your model
 
 ```ruby
 class User < ApplicationRecord
-  has_kms_key ENV["KMS_KEY_ID"]
-  has_kms_key ENV["KMS_KEY_ID"], name: :phone
+  has_kms_key
+  has_kms_key name: :phone, key_id: "..."
 
   attr_encrypted :email, key: :kms_key
   attr_encrypted :phone, key: :kms_key_phone

data/lib/kms_encrypted.rb

@@ -8,7 +8,8 @@ module KmsEncrypted
   end
 
   module Model
-    def has_kms_key(key_id, name: nil)
+    def has_kms_key(legacy_key_id = nil, name: nil, key_id: nil)
+      key_id ||= legacy_key_id || ENV["KMS_KEY_ID"]
       raise ArgumentError, "Missing key id" unless key_id
 
       key_method = name ? "kms_key_#{name}" : "kms_key"

data/lib/kms_encrypted/version.rb

@@ -1,3 +1,3 @@
 module KmsEncrypted
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kms_encrypted
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms