aws-ec2 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d442b6604282a2348109a44d78ff9f1e9ecc2bcf73761575f9bb5da1d522eefe
-  data.tar.gz: 64028e1f0a9689427ca076707e9dd9cd601be9f31df695ac22e846a7d1447187
+  metadata.gz: 133b3adbf26d2f3f9e02e7aa2f97dfc3e899cff09e3c7195dd2fb3670c35f1d2
+  data.tar.gz: d16e6f935714439ae350822441e84f7192ba14837d2c88df42517d77e49e2e77
 SHA512:
-  metadata.gz: bbffaf1544f51801165d44adcb40b0c5bfb95db733cdadb062d9dc947861be2fdaa373d1440c29ea675e4020c8449d1ab2f9ff3b04761d0f95df9f198f1e5aa9
-  data.tar.gz: c7f919272fd4c804d7659499c8480914068dc005975ec469bc7412a170e9d90b8f60c6aa331490c7b3653d52c4864bc24f1af3ed1d45c050711de4abd04270d7
+  metadata.gz: 7cce36e27bb90ac8e05c1f29ac209e6d6804510d0074da10cde099972f90f67af2cf6660a276b9f405f71284f1e16d1f5d1e4880ff0ce7cb5e9cbe53b99986b9
+  data.tar.gz: c1331df63412bfc9ecf623912257c3a25615e3e631edccc30f2a22daf5c925f18175b5dc4a0246a0e93a924d296e5fd5ef3d99242f1a950f8b224245f4dd8d92

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.
 
+## [1.4.3]
+- fix get_region when aws-ec2 called from an ec2 instance
+
 ## [1.4.2]
 - fix cloudwatch for ubuntu
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aws-ec2 (1.3.1)
+    aws-ec2 (1.4.2)
       activesupport
       aws-sdk-ec2
       aws-sdk-s3

data/lib/aws_ec2/create.rb

@@ -29,26 +29,6 @@ module AwsEc2
       display_cloudwatch_info(instance_id)
     end
 
-    def display_cloudwatch_info(instance_id)
-      return unless @options[:cloudwatch]
-
-      region = `aws configure get region`.strip
-      region = 'us-east-1' if region == ''
-      url = "https://#{region}.console.aws.amazon.com/cloudwatch/home?region=#{region}#logEventViewer:group=ec2;stream=#{instance_id}/var/log/cloud-init-output.log"
-      puts "To view instance's cloudwatch logs visit:"
-      puts "  #{url}"
-      puts "Note: It takes a little time for the instance to launch and report logs."
-      add_to_clipboard(url)
-    end
-
-    def add_to_clipboard(text)
-      return unless RUBY_PLATFORM =~ /darwin/
-      return unless system("type pbcopy > /dev/null")
-
-      system(%[echo "#{text}" | pbcopy])
-      puts "Pro tip: The CloudWatch Console Link has been added to your copy-and-paste clipboard."
-    end
-
     def run_instances(params)
       ec2.run_instances(params)
     rescue Aws::EC2::Errors::ServiceError => e
@@ -107,6 +87,43 @@ module AwsEc2
       exit
     end
 
+    def display_cloudwatch_info(instance_id)
+      return unless @options[:cloudwatch]
+
+      region = get_region
+      url = "https://#{region}.console.aws.amazon.com/cloudwatch/home?region=#{region}#logEventViewer:group=ec2;stream=#{instance_id}/var/log/cloud-init-output.log"
+      puts "To view instance's cloudwatch logs visit:"
+      puts "  #{url}"
+      puts "Note: It takes a little time for the instance to launch and report logs."
+      add_to_clipboard(url)
+    end
+
+    def add_to_clipboard(text)
+      return unless RUBY_PLATFORM =~ /darwin/
+      return unless system("type pbcopy > /dev/null")
+
+      system(%[echo "#{text}" | pbcopy])
+      puts "Pro tip: The CloudWatch Console Link has been added to your copy-and-paste clipboard."
+    end
+
+    def get_region
+      # Highest precedence is the setting in ~/.aws/config and AWS_PROFILE used
+      aws_found = system("type aws > /dev/null")
+      if aws_found
+        region = `aws configure get region`.strip
+        return region
+      end
+
+      # Assumes instace being launched in the same region as the calling ec2 instance
+      curl_found = system("type curl > /dev/null")
+      if curl_found
+        region = `curl --connect-timeout 3  -s 169.254.169.254/latest/meta-data/placement/availability-zone | sed s'/.$//'`
+        return region unless region == ''
+      end
+
+      return 'us-east-1' # fallback default
+    end
+
     def pretty_display(data)
       data = data.deep_stringify_keys
 

data/lib/aws_ec2/scripts/cloudwatch/configure.sh

@@ -79,6 +79,6 @@ datetime_format =
 EOF
 
 if [ -f /etc/awslogs/awscli.conf ]; then
-  region=$(curl 169.254.169.254/latest/meta-data/placement/availability-zone | sed s'/.$//')
+  region=$(curl -s 169.254.169.254/latest/meta-data/placement/availability-zone | sed s'/.$//')
   sed -i -e "s/region = us-east-1/region = $region/g" /etc/awslogs/awscli.conf
 fi

data/lib/aws_ec2/version.rb

@@ -1,3 +1,3 @@
 module AwsEc2
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Tung Nguyen