awskeyring 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6b813b7d04318821e16122cf1c377dd51d48ecef326e8bd67a4d5dfb914b221
-  data.tar.gz: 81d9c40c0ebff68f61802feb59ebbde9be8ad1745a62abcd01665eb0de163cad
+  metadata.gz: 9c691b2c94541dc7bf3562ae06b25231dbc8b04f42a04cb327209424f46c9849
+  data.tar.gz: a4c0362c4656c64de13708d44a38a1258da651abc1fb79635d99992b0259fd4a
 SHA512:
-  metadata.gz: 64f8f178ec9ac97ba91bfd018b091fd8495ec716933bee81fa53045c03553e7903aaae96ff0d1dfe391f665f324e917059c0bcc509b0c742b13441b41d765cd0
-  data.tar.gz: 608d9ade4b39d5ea2eab4149c6d1e976c50e0877033012a06f58c0847ed21e566824c77037076aa995a281faf4a85b2a512ffbe7c31c313998a017673960ebaf
+  metadata.gz: d7982836f83b748af2e4a64ce91b74f33f7f26a6423919fe0ce114011b8ffae9af61039e93a9307e7caeb97eb60ba22131dc57725d6bedd69529fc80e57c6db2
+  data.tar.gz: 79700754547b8ce87008a8624686dac7d362947f48e2e9a8a9904e71522454c53c63ed5edfc0fea5f16f5b2be9409641375836fb78fc0dd1c6f91c7b7b6464ca

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v1.2.0](https://github.com/servian/awskeyring/tree/v1.2.0) (2020-01-20)
+
+[Full Changelog](https://github.com/servian/awskeyring/compare/v1.1.2...v1.2.0)
+
+**Implemented enhancements:**
+
+- Check for existing account keys and role arns [\#56](https://github.com/servian/awskeyring/pull/56) ([tristanmorgan](https://github.com/tristanmorgan))
+
 ## [v1.1.2](https://github.com/servian/awskeyring/tree/v1.1.2) (2020-01-06)
 
 [Full Changelog](https://github.com/servian/awskeyring/compare/v1.1.1...v1.1.2)

data/lib/awskeyring.rb

@@ -87,6 +87,11 @@ module Awskeyring # rubocop:disable Metrics/ModuleLength
     load_keychain.generic_passwords
   end
 
+  # return an item by accout
+  private_class_method def self.item_by_account(account)
+    all_items.where(account: account).first
+  end
+
   # Add an account item
   #
   # @param [String] account The account name to create
@@ -308,6 +313,16 @@ module Awskeyring # rubocop:disable Metrics/ModuleLength
     account_name
   end
 
+  # Validate access key does not exists
+  #
+  # @param [String] access_key the associated access key.
+  def self.access_key_not_exists(access_key)
+    Awskeyring::Validate.access_key(access_key)
+    raise 'Access KEY already exists' if item_by_account(access_key)
+
+    access_key
+  end
+
   # Validate role exists
   #
   # @param [String] role_name the associated role name.
@@ -327,4 +342,14 @@ module Awskeyring # rubocop:disable Metrics/ModuleLength
 
     role_name
   end
+
+  # Validate role arn not exists
+  #
+  # @param [String] role_arn the associated role arn.
+  def self.role_arn_not_exists(role_arn)
+    Awskeyring::Validate.role_arn(role_arn)
+    raise 'Role ARN already exists' if item_by_account(role_arn)
+
+    role_arn
+  end
 end

data/lib/awskeyring/version.rb

@@ -2,7 +2,7 @@
 
 module Awskeyring
   # The Gem's version number
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
   # The Gem's homepage
   HOMEPAGE = 'https://github.com/servian/awskeyring'
 end

data/lib/awskeyring_command.rb

@@ -149,7 +149,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_not_exists)
     )
     key = ask_check(
-      existing: options[:key], message: I18n.t('message.key'), validator: Awskeyring::Validate.method(:access_key)
+      existing: options[:key], message: I18n.t('message.key'), validator: Awskeyring.method(:access_key_not_exists)
     )
     secret = ask_check(
       existing: options[:secret], message: I18n.t('message.secret'),
@@ -181,7 +181,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       limited_to: Awskeyring.list_account_names
     )
     key = ask_check(
-      existing: options[:key], message: I18n.t('message.key'), validator: Awskeyring::Validate.method(:access_key)
+      existing: options[:key], message: I18n.t('message.key'), validator: Awskeyring.method(:access_key_not_exists)
     )
     secret = ask_check(
       existing: options[:secret], message: I18n.t('message.secret'),
@@ -207,7 +207,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     )
     arn = ask_check(
       existing: options[:arn], message: I18n.t('message.arn'),
-      validator: Awskeyring::Validate.method(:role_arn)
+      validator: Awskeyring.method(:role_arn_not_exists)
     )
 
     Awskeyring.add_role(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awskeyring
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam