ey-core 3.4.4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c37b8856b7cd6b06d2996a64d376bbb170f75f
-  data.tar.gz: 17060911ccff177a709c111a1916fc8d42b3dadb
+  metadata.gz: '01976d3d26f0fd5a47e947832532b2db2053d854'
+  data.tar.gz: 3ee031e086e2385ca94d78e8f06578bd3adbce35
 SHA512:
-  metadata.gz: 3911ac7f2dab3d27fa225e563e9abb46f6ab2b4a95ee82153a70668480f56a751a2623c731a24cfbc17efc0615c6f7d56e210af24b01ceeb458833aee45a8ba3
-  data.tar.gz: fb4d4e6c23f50159d54c784e07fd62c63998b33d9930a67c57e1e364fc7a0fd917f9e4d11c58b31a3ae0108278dfe09504162f35b17ad8a6d47e17209f07138d
+  metadata.gz: 0fc5f5e9e0c221aa2d852bacc71d99391d365fb6e2f98896ea4678306f9c64bf2e3c84d0b3257e6f86658f17391ee0d3bcac8a54c4468d555d2cb48e0509e20f
+  data.tar.gz: a8e3e8cc838919fe69e503e49ff13866f7a7a899783c2ab73d50cebeb0e2f4f0713d37bd35081ba7feddc9578adfc2be764ec35d6c60cf0750343cdf38c71b2d

data/CHANGELOG.md

@@ -2,12 +2,20 @@
 
 ## [Unreleased](https://github.com/engineyard/core-client-rb/tree/HEAD)
 
-[Full Changelog](https://github.com/engineyard/core-client-rb/compare/v2.8.4...HEAD)
+[Full Changelog](https://github.com/engineyard/core-client-rb/compare/v3.5.0...HEAD)
 
 **Merged pull requests:**
 
-- \[ENG-193\] Create untracked addresses via smithy [\#34](https://github.com/engineyard/core-client-rb/pull/34) ([omgitsads](https://github.com/omgitsads))
-- remove usage of hmac client in specs [\#33](https://github.com/engineyard/core-client-rb/pull/33) ([lanej](https://github.com/lanej))
+## [v3.5.0](https://github.com/engineyard/core-client-rb/tree/v3.5.0) (2018-04-04)
+[Full Changelog](https://github.com/engineyard/core-client-rb/compare/v3.4.4...v3.5.0)
+
+**Merged pull requests:**
+
+- Add support for autoscaling policies [\#110](https://github.com/engineyard/core-client-rb/pull/101) ([thorn](https://github.com/thorn))
+- Add support for environment variables [\#90](https://github.com/engineyard/core-client-rb/pull/90) ([rzaharenkov](https://github.com/rzaharenkov))
+- Add ability to send configuration options together with blueprint [\#104](https://github.com/engineyard/core-client-rb/pull/104) ([ramonpm](https://github.com/ramonpm))
+- Add support for address.scope parameter for EIP [\#102](https://github.com/engineyard/core-client-rb/pull/102) ([thorn](https://github.com/thorn))
+- Various fixes for `servers` command [\#103](https://github.com/engineyard/core-client-rb/pull/103) ([binarypaladin](https://github.com/binarypaladin))
 
 ## [v2.8.4](https://github.com/engineyard/core-client-rb/tree/v2.8.4) (2015-08-12)
 [Full Changelog](https://github.com/engineyard/core-client-rb/compare/v2.8.3...v2.8.4)

data/bin/ey-core

@@ -1,4 +1,12 @@
 #!/usr/bin/env ruby
+
+git_path = File.expand_path("../../.git", __FILE__)
+
+if File.exist? git_path
+  lib_dir = File.expand_path("../../lib", __FILE__)
+  $LOAD_PATH.unshift( lib_dir )
+end
+
 require File.expand_path('../../lib/ey-core/cli/main', __FILE__)
 
 Ey::Core::Cli::Main.new(ARGV).execute!

data/features/environment_variables.feature

@@ -0,0 +1,54 @@
+Feature: Environment Variables
+  In order to know current values of environment variables assigned to my Engine Yard environments
+  As a User
+  I want to be able to list the environment variables for environments which I'm associated
+
+  Background:
+    Given I'm an Engine Yard user
+    And ey-core is configured with my cloud token
+    And I have the following accounts:
+      | Account Name  |
+      | one           |
+      | two           |
+      | three         |
+    And I have the following applications:
+      | Account Name  | Application Name |
+      | one           | blog_app         |
+      | two           | todo_app         |
+    And I have the following environments:
+      | Application Name  | Environment Name  |
+      | blog_app          | staging           |
+      | blog_app          | production        |
+      | todo_app          | staging           |
+    And I have the following environment variables:
+      | Name          | Value               | Application Name  | Environment Name  | Sensitive |
+      | SECRET_BASE   | abc=                | blog_app          | staging           | false     |
+      | DB_PASSWORD   | 123qweasd!!         | blog_app          | staging           | true      |
+      | SECRET_BASE   | qwe=                | blog_app          | production        | false     |
+      | DB_PASSWORD   | 987qweasd!!         | blog_app          | production        | true      |
+      | DB_PASSWORD   | my_secure_password  | todo_app          | staging           | true      |
+
+  Scenario: Listing all of my environment variables
+    When I run `ey-core environment_variables`
+    Then I see the name and value for all of my environments as well as name of associated environment and application
+
+  Scenario Outline: Listing environment variables for a specific environment
+    When I run `ey-core environment_variables <Environment Flag> staging`
+    Then I see the environment variables associated with `staging` environment
+    But I do not see environment variables associated with any other environments different from `staging`
+
+    Examples:
+      | Environment Flag  |
+      | -e                |
+      | --environment     |
+
+  Scenario Outline: Listing environment variables for a specific application
+    When I run `ey-core environment_variables <Application Flag> blog_app`
+    Then I see the environment variables associated with `blog_app` application
+    But I do not see environment variables associated with any other applications different from `blog_app`
+
+    Examples:
+      | Application Flag  |
+      | -a                |
+      | --application     |
+

data/features/step_definitions/accounts_steps.rb

@@ -15,6 +15,20 @@ Given %(I'm associated with several accounts) do
   memorize_fact(:accounts, [account1, account2])
 end
 
+Given %r(^I have the following accounts:$) do |account_names|
+  account_names.hashes.each do |account_hash|
+    known_accounts.push(
+      create_account(
+        client: client,
+        owner: current_user,
+        account: {
+          name: account_hash['Account Name']
+        }
+      )
+    )
+  end
+end
+
 Then %(I see the name and ID of each of my accounts) do
   recall_fact(:accounts).each do |account|
     expect(output_text).to include(account.id)

data/features/step_definitions/applications_steps.rb

@@ -1,17 +1,3 @@
-Given %r(^I have the following accounts:$) do |account_names|
-  account_names.hashes.each do |account_hash|
-    known_accounts.push(
-      create_account(
-        client: client,
-        owner: current_user,
-        account: {
-          name: account_hash['Account Name']
-        }
-      )
-    )
-  end
-end
-
 Given %(each of my accounts has several applications) do
   known_accounts.each do |account|
     known_apps.push(
@@ -24,6 +10,13 @@ Given %(each of my accounts has several applications) do
   end
 end
 
+Given(/^I have the following applications:$/) do |applications|
+  applications.hashes.each do |application_hash|
+    account = known_accounts.find { |acc| acc.name == application_hash['Account Name'] }
+    known_apps.push(create_application(account: account, name: application_hash['Application Name']))
+  end
+end
+
 Then %(I see the name and ID for all of my applications) do
   known_apps.each do |app|
     expect(output_text).to match(/#{Regexp.escape(app.id.to_s)}\s+\|\s+#{Regexp.escape(app.name)}/)

data/features/step_definitions/environment_variables_steps.rb

@@ -0,0 +1,51 @@
+Given(/^I have the following environment variables:$/) do |variables|
+  variables.hashes.each do |variable_hash|
+    application = known_apps.find { |app| app.name == variable_hash['Application Name'] }
+    environment = known_environments.find { |env| env.name == variable_hash['Environment Name'] }
+    known_environment_variables.push(
+      create_environment_variable(
+        application: application,
+        environment: environment,
+        environment_variable: {
+          name: variable_hash['Name'],
+          value: variable_hash['Value'],
+          sensitive: variable_hash['Sensitive']
+        }
+      )
+    )
+  end
+end
+
+Then(/^I see the name and value for all of my environments as well as name of associated environment and application$/) do
+  known_environment_variables.each do |environment_variable|
+    expect(output_text).to match(match_environment_variable_regexp(environment_variable))
+  end
+end
+
+Then(/^I see the environment variables associated with `(\w+)` environment$/) do |environment_name|
+  known_environment_variables.each do |environment_variable|
+    next unless environment_variable.environment_name == environment_name
+    expect(output_text).to match(match_environment_variable_regexp(environment_variable))
+  end
+end
+
+Then(/^I do not see environment variables associated with any other environments different from `(\w+)`$/) do |environment_name|
+  known_environment_variables.each do |environment_variable|
+    next if environment_variable.environment_name == environment_name
+    expect(output_text).not_to match(match_environment_variable_regexp(environment_variable))
+  end
+end
+
+Then(/^I see the environment variables associated with `(\w+)` application$/) do |application_name|
+  known_environment_variables.each do |environment_variable|
+    next unless environment_variable.application_name == application_name
+    expect(output_text).to match(match_environment_variable_regexp(environment_variable))
+  end
+end
+
+Then(/^I do not see environment variables associated with any other applications different from `(\w+)`$/) do |application_name|
+  known_environment_variables.each do |environment_variable|
+    next if environment_variable.application_name == application_name
+    expect(output_text).not_to match(match_environment_variable_regexp(environment_variable))
+  end
+end

data/features/step_definitions/environments_steps.rb

@@ -14,6 +14,21 @@ Given %(each of my applications has an environment) do
   end
 end
 
+Given(/^I have the following environments:$/) do |environments|
+  environments.hashes.each do |environment_hash|
+    application = known_apps.find { |app| app.name == environment_hash['Application Name'] }
+    known_environments.push(
+      create_environment(
+        account: application.account,
+        application: application,
+        environment: {
+          name: environment_hash['Environment Name']
+        }
+      )
+    )
+  end
+end
+
 Then %(I see the name and ID for all of my environments) do
   known_environments.each do |environment|
     expect(output_text).to match(/#{Regexp.escape(environment.id.to_s)}\s+\|\s+#{Regexp.escape(environment.name)}/)

data/features/support/environment_variable_helpers.rb

@@ -0,0 +1,20 @@
+module EnvironmentVariableHelpers
+  ENVIRONMENT_VARIABLE_DISPLAY_FIELDS = %i[id name value environment_name application_name]
+
+  def known_environment_variables
+    begin
+      recall_fact(:environment_variables)
+    rescue
+      memorize_fact(:environment_variables, [])
+    end
+  end
+
+  def match_environment_variable_regexp(environment_variable)
+    regexp_parts = ENVIRONMENT_VARIABLE_DISPLAY_FIELDS.map do |field|
+      Regexp.escape(environment_variable.send(field).to_s)
+    end
+    Regexp.new(regexp_parts.join("(\s+)\\|(\s+)"))
+  end
+end
+
+World(EnvironmentVariableHelpers)

data/features/support/resource_helpers.rb

@@ -127,6 +127,18 @@ module ResourceHelpers
     environment
   end
 
+  def create_environment_variable(options={})
+    application = options[:application] || create_application
+    environment = options[:environment] || create_environment
+
+    environment_variable = options[:environment_variable] || {}
+    environment_variable.merge!(application_id: application.id, environment: environment.id)
+    environment_variable[:name] ||= SecureRandom.hex(8)
+    environment_variable[:value] ||= SecureRandom.hex(32)
+
+    client.environment_variables.create!(environment_variable)
+  end
+
   def create_provider_location(client, attributes={})
     attributes = Cistern::Hash.stringify_keys(attributes)
 

data/lib/ey-core/cli/environment_variables.rb

@@ -0,0 +1,71 @@
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/helpers/stream_printer'
+
+module Ey
+  module Core
+    module Cli
+      class EnvironmentVariables < Subcommand
+        MASK = '****'.freeze
+        SYMBOLS_TO_DISPLAY = 4
+        MAX_LENGTH_TO_DISPLAY = 30
+
+        include Ey::Core::Cli::Helpers::StreamPrinter
+
+        title "environment_variables"
+        summary "Retrieve a list of Engine Yard environment variables for environments that you have access to."
+
+        option :environment,
+          short: 'e',
+          long: 'environment',
+          description: 'Filter by environmeent name or id',
+          argument: 'Environment'
+
+        option :application,
+          short: 'a',
+          long: 'application',
+          description: 'Filter by application name or id',
+          argument: 'Application'
+
+        switch :display_sensitive,
+          short: 's',
+          long: 'display_sensitive',
+          description: 'Determines whether values of sensitive variables should be printed',
+          argument: 'Display Sensitive'
+
+        def handle
+          environment_variables = if option(:application)
+                                    core_applications(option(:application)).flat_map(&:environment_variables)
+                                  elsif option(:environment)
+                                    core_environments(option(:environment)).flat_map(&:environment_variables)
+                                  else
+                                    core_environment_variables
+                                  end
+
+          stream_print("ID" => 10, "Name" => 30, "Value" => 50, "Environment" => 30, "Application" => 30) do |printer|
+            environment_variables.each_entry do |ev|
+              printer.print(ev.id, ev.name, print_variable_value(ev), ev.environment_name, ev.application_name)
+            end
+          end
+        end
+
+        private
+
+        def print_variable_value(environment_variable)
+          if environment_variable.sensitive && !switch_active?(:display_sensitive)
+            hide_sensitive_data(environment_variable.value)
+          else
+            environment_variable.value
+          end
+        end
+
+        def hide_sensitive_data(value)
+          if value.length > SYMBOLS_TO_DISPLAY
+            MASK + value[-SYMBOLS_TO_DISPLAY, SYMBOLS_TO_DISPLAY]
+          else
+            MASK
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ey-core/cli/helpers/core.rb

@@ -173,6 +173,35 @@ module Ey
             end
           end
 
+          # Fetches a list of environments by given name or ID.
+          #
+          # @param environment_name_or_id [String] name or ID of environment.
+          #
+          # @return [Array<Ey::Core::Client::Environment>] list of environments.
+          def core_environments(environment_name_or_id)
+            core_client.environments.all(name: environment_name_or_id).tap do |result|
+              result << core_client.environments.get(environment_name_or_id) if result.empty?
+            end.to_a.compact
+          end
+
+          # Fetches a list of applications by given name or ID.
+          #
+          # @param application_name_or_id [String] name or ID of application.
+          #
+          # @return [Array<Ey::Core::Client::Environment>] list of environments.
+          def core_applications(application_name_or_id)
+            core_client.applications.all(name: application_name_or_id).tap do |result|
+              result << core_client.applications.get(application_name_or_id) if result.empty?
+            end.to_a.compact
+          end
+
+          # Fetches a list of environment variables available for current user.
+          #
+          # @return [Array<Ey::Core::Client::EnvironmentVariable>] list of environment variables.
+          def core_environment_variables
+            core_client.environment_variables
+          end
+
           def write_core_yaml(token=nil)
             core_yaml[core_url] = token if token
             File.open(self.class.core_file, "w") {|file|

data/lib/ey-core/cli/main.rb

@@ -14,6 +14,7 @@ require 'ey-core/cli/console'
 require 'ey-core/cli/current_user'
 require 'ey-core/cli/deploy'
 require 'ey-core/cli/environments'
+require 'ey-core/cli/environment_variables'
 require 'ey-core/cli/help'
 require 'ey-core/cli/init'
 require 'ey-core/cli/login'
@@ -45,6 +46,7 @@ module Ey
         mount CurrentUser
         mount Deploy
         mount Environments
+        mount EnvironmentVariables
         mount Help
         mount Init
         mount Login

data/lib/ey-core/cli/servers.rb

@@ -4,36 +4,53 @@ module Ey
   module Core
     module Cli
       class Servers < Subcommand
-        title "servers"
-        summary "List servers you have access to"
+        title 'servers'
+        summary 'List servers you have access to'
 
         option :account,
           short: 'c',
           long: 'account',
           description: 'Filter by account name or id',
-          argument: 'Account'
+          argument: 'account'
 
         option :environment,
-          short: "-e",
-          long: "environment",
-          description: "Filter by environment.",
-          argument: "environment"
+          short: 'e',
+          long: 'environment',
+          description: 'Filter by environment.',
+          argument: 'environment'
+
+        option :role,
+          short: 'r',
+          long: 'role',
+          description: 'Filter by server role.',
+          argument: 'role'
 
         def handle
-          puts TablePrint::Printer.
-            new(servers, [{id: {width: 10}}, :role, :provisioned_id]).
-            table_print
+          puts TablePrint::Printer.new(
+            servers,
+            [
+              { id: { width: 10 } },
+              :role,
+              :provisioned_id,
+              { public_hostname: { width: 50 } }
+            ]
+          ).table_print
         end
 
         private
         def servers
-          if option(:account)
-            core_client.servers.all(account: core_account)
-          elsif environment = option(:environment)
-            (core_client.environments.get(environment) || core_client.environments.first(name: environment)).servers.all
-          else
-            core_client.servers.all
-          end
+          filter_opts = {}
+
+          operator =
+            if option(:environment)
+              core_account.environments.first(name: option(:environment))
+            else
+              filter_opts[:account] = core_account.id if option(:account)
+              core_client
+            end
+
+          filter_opts[:role] = option(:role).split(',') if option(:role)
+          operator ? operator.servers.all(filter_opts) : nil
         end
       end
     end