tagenv 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fbe06e6524e376cdabf53995fa2000c09cb098b
-  data.tar.gz: 22e34eb3396dfdcdfd82f0c3ae4a562467eb1fb6
+  metadata.gz: 8046a15f8a4b53a188d8826ed47bfc5024623c53
+  data.tar.gz: f05be3aa35a9f2e607140886173724a38ca2b043
 SHA512:
-  metadata.gz: 3af61d352254dfd83dec9ccb877e68971bbcd461e0b90378fae8b5567075d0b59600562ad0b882d67a597d41d7764f6350d1701d03137fb988fce59f3ee39189
-  data.tar.gz: c67d6403dd729c610523d8da213486c8363f76fccaf1b02021dd766a11e2b01cf78fe301d03819aa301957954b284cd3464b13aad730b6f0c39971d7a8dade11
+  metadata.gz: 7cf95dcf7b8c8f317a35c09fd80d2a289ee15004a81bdf8e9b243b333493471e801c35ca655b22acd071a1c15d76315fdf510cef15e58b24b9863ccb11eea9c9
+  data.tar.gz: 1e3be10e4e492334563f6601a21af8148e4cbd77b48174fa4bb805a95033afe6c93be1ed209436b183dcc3e708ab147b532f7d29c28f1c7d011cf3ab9034285a

data/lib/tagenv/ec2/tag.rb

@@ -4,24 +4,26 @@ require_relative 'tag_util'
 module Tagenv
   module Ec2
     class Tag
-      def initialize
+      def initialize(prefix: '', instance_id: nil)
         @logger = Logger.new(STDOUT)
         region = ENV['AWS_REGION'] || Metadata.get_document['region']
         @ec2 = Aws::EC2::Client.new(region: region)
+        @prefix = prefix
+        @instance_id = instance_id
       end
 
-      def get_tag_hash(instance_id: nil)
-        instance_id = instance_id || Metadata.get_instance_id
-        instances_tag_with_id(instance_id)
+      def get_tag_hash
+        instances_tag_with_id
       end
 
       private
 
-      def instances_tag_with_id(instance_id)
+      def instances_tag_with_id
+        @instance_id = @instance_id || Metadata.get_instance_id
         tags = @ec2.describe_instances(
-          instance_ids: [instance_id]
+          instance_ids: [@instance_id]
         ).data.to_h[:reservations].map { |instance| instance[:instances].first }.first[:tags]
-        TagUtil.convert_tag_hash(tags)
+        TagUtil.convert_tag_hash(@prefix, tags)
       end
     end
   end

data/lib/tagenv/ec2/tag_util.rb

@@ -3,10 +3,10 @@ require 'aws-sdk'
 module Tagenv
   module Ec2
     class TagUtil
-      def self.convert_tag_hash(tags)
+      def self.convert_tag_hash(prefix, tags)
         result = {}
         tags.each {|hash|
-          result[hash['key'] || hash[:key]] = hash['value'] || hash[:value]
+          result[prefix + (hash['key'] || hash[:key])] = hash['value'] || hash[:value]
         }
         result
       end

data/lib/tagenv/version.rb

@@ -1,4 +1,4 @@
 module Tagenv
   # tagenv version
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/tagenv.rb

@@ -8,7 +8,7 @@ module Tagenv
   def self.load(prefix: '', instance_id: nil, provider: 'ec2')
     tag_hash = {}
     if provider == 'ec2'
-      @ec2_tag = Ec2::Tag.new
+      @ec2_tag = Ec2::Tag.new(prefix: prefix, instance_id: instance_id)
       tag_hash = @ec2_tag.get_tag_hash(instance_id)
     else
       raise "Unsupport provider [#{provider}]"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagenv
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - toyama0919