heroku-config 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a0676bf09a3f428fafa5a9c04dc2199f8b7c86712c406591ee300c7725a851
-  data.tar.gz: 3b4c9a26b6f26788a07a5cecd85de0c16a317f4b174aed58dfa43b02b2b5796a
+  metadata.gz: 1c1f598d125e5ec01b4aca3b351bede098311ef847a6a428a53d21466a5f805e
+  data.tar.gz: 35ed5622a7474a5873820ac3c82af4ea3fe485fe22ead142b7a0383068427f4a
 SHA512:
-  metadata.gz: 5840cceab8d8bb86d4a2bc126f8e1e132cb7e4849e2b7b31a475cf37ed80b9aa25f60e94afc8b7611ec4e2c9517cd48c1a2779e3b4b4b2b0c989c48307781dee
-  data.tar.gz: e07acd595822a3c66c53f3b727180bf87e9d30aae5f9fc26db4374035a6786859736bb58597402349bdfee96c56219688defb6285cf78d0ca71b73c9a7c2dadd
+  metadata.gz: 32742182eeccae08d5984bf7ce0e65ac12a93e4e39a5b72a7dd158dd2a47397b250a0334f733ec25f61769c95eadf1f4e21b523df94a4b400312c6b52f56e5de
+  data.tar.gz: a433cafaa1fba5d6f1ef25c2a4989d3eac1f68f52d41640cd3246f2a0a0381d5647fb70ed49b3fb5e4e7150fe8ca601e13be9c7e986b62b1fae500fda32a866e

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.4.0]
+- support for custom aws key and secret heroku config var
+
 ## [0.3.0]
 - add aws-rotate-all command
 - friendly error if access key does not exist on heroku app

data/README.md

@@ -54,6 +54,19 @@ For more help:
 
     heroku-config aws-rotate-all -h
 
+## Custom Heroku Config Variable Names for AWS Key and Secret
+
+Your app may not be using `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` for the heroku config vars. You can specify the config vars to use with the `--id-key-name` and `--secret-key-name` options. Example:
+
+    heroku-config aws-rotate protected-oasis-24054 --id-key-name AWS_KEY --secret-key-name AWS_SECRET
+
+For the `heroku-config aws-rotate-all` command, use a `:` to separate the app, id key name, and secret key name for the FILE format. Example:
+
+    radiant-fortress-40674
+    protected-oasis-24054:aws_key:aws_secret
+
+Here `radiant-fortress-40674` will use the default `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`, whereas `protected-oasis-24054` will use `aws_key` and `aws_secret`.
+
 ## Installation
 
 Install with:

data/lib/heroku_config/aws_key.rb

@@ -1,6 +1,7 @@
 module HerokuConfig
   class AwsKey < Base
     include AwsServices
+    include AwsKeyNameMap
     class MaxKeysError < StandardError; end
     class AccessKeyNotFound < StandardError; end
 
@@ -83,8 +84,8 @@ module HerokuConfig
 
     def update_heroku_config(new_key, new_secret)
       out = config.set(
-        "AWS_ACCESS_KEY_ID" => new_key,
-        "AWS_SECRET_ACCESS_KEY" => new_secret,
+        id_key_name => new_key,
+        secret_key_name => new_secret,
       )
       puts "Setting heroku config variables"
       puts out

data/lib/heroku_config/aws_key_name_map.rb

@@ -0,0 +1,11 @@
+module HerokuConfig
+  module AwsKeyNameMap
+    def id_key_name
+      @options[:id_key_name] || "AWS_ACCESS_KEY_ID"
+    end
+
+    def secret_key_name
+      @options[:secret_key_name] || "AWS_SECRET_ACCESS_KEY"
+    end
+  end
+end

data/lib/heroku_config/aws_rotate.rb

@@ -1,5 +1,6 @@
 module HerokuConfig
   class AwsRotate < Base
+    include AwsKeyNameMap
     class MaxKeysError < StandardError; end
 
     def initialize(options={})
@@ -8,9 +9,9 @@ module HerokuConfig
     end
 
     def run
-      key_id = config.get("AWS_ACCESS_KEY_ID")
+      key_id = config.get(id_key_name)
       unless key_id
-        puts "WARN: No AWS_ACCESS_KEY_ID found for #{@app.color(:green)} app."
+        puts "WARN: No #{id_key_name} found for #{@app.color(:green)} app."
         if @options[:cli]
           puts "Exiting"
           exit 0

data/lib/heroku_config/aws_rotate_all.rb

@@ -11,13 +11,19 @@ module HerokuConfig
         return
       end
 
-      apps.each do |app|
-        AwsRotate.new(@options.merge(app: app)).run
+      apps.each do |app, id_key_name, secret_key_name|
+        options = @options.merge(
+          app: app,
+          id_key_name: id_key_name || 'AWS_ACCESS_KEY_ID',
+          secret_key_name: secret_key_name || 'AWS_SECRET_ACCESS_KEY',
+        )
+        AwsRotate.new(options).run
       end
     end
 
     def apps
-      IO.readlines(@file).map(&:strip).reject(&:empty?)
+      lines = IO.readlines(@file).map(&:strip).reject(&:empty?)
+      lines.map { |l| l.split(':') }
     end
     memoize :apps
   end

data/lib/heroku_config/cli.rb

@@ -3,14 +3,21 @@ module HerokuConfig
     class_option :verbose, type: :boolean
     class_option :noop, type: :boolean
 
+    key_name_options = Proc.new do
+      option :id_key_name, default: "AWS_ACCESS_KEY_ID", desc: "Heroku config variable name for AWS_ACCESS_KEY_ID"
+      option :secret_key_name, default: "AWS_SECRET_ACCESS_KEY", desc: "Heroku config variable name for AWS_SECRET_ACCESS_KEY"
+    end
+
     desc "aws-rotate APP", "Rotates AWS key for app"
     long_desc Help.text(:aws_rotate)
+    key_name_options.call
     def aws_rotate(app)
       AwsRotate.new(options.merge(app: app, cli: true)).run
     end
 
     desc "aws-rotate-all FILE", "Rotates AWS key for list of apps"
     long_desc Help.text(:aws_rotate_all)
+    key_name_options.call
     def aws_rotate_all(file)
       AwsRotateAll.new(options.merge(file: file)).run
     end

data/lib/heroku_config/version.rb

@@ -1,3 +1,3 @@
 module HerokuConfig
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku-config
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -190,7 +190,6 @@ files:
 - ".rspec"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -201,6 +200,7 @@ files:
 - lib/heroku_config.rb
 - lib/heroku_config/autoloader.rb
 - lib/heroku_config/aws_key.rb
+- lib/heroku_config/aws_key_name_map.rb
 - lib/heroku_config/aws_rotate.rb
 - lib/heroku_config/aws_rotate_all.rb
 - lib/heroku_config/aws_services.rb

data/Gemfile.lock

@@ -1,86 +0,0 @@
-PATH
-  remote: .
-  specs:
-    heroku-config (0.2.0)
-      activesupport
-      aws-sdk-core
-      aws-sdk-iam
-      memoist
-      rainbow
-      thor
-      zeitwerk
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.240.0)
-    aws-sdk-core (3.78.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-iam (1.31.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-    byebug (11.0.1)
-    cli_markdown (0.1.0)
-    codeclimate-test-reporter (1.0.9)
-      simplecov (<= 0.13)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    i18n (1.7.0)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    json (2.2.0)
-    memoist (0.16.1)
-    minitest (5.13.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  byebug
-  cli_markdown
-  codeclimate-test-reporter
-  heroku-config!
-  rake
-  rspec
-
-BUNDLED WITH
-   2.0.2