Chris Mague 7 anni fa
parent
commit
70a6c8e734
6 ha cambiato i file con 37 aggiunte e 37 eliminazioni
  1. 1 1
      Gemfile
  2. 6 6
      lib/neoinfra/aws.rb
  3. 16 17
      lib/neoinfra/cloudwatch.rb
  4. 8 9
      lib/neoinfra/nodes.rb
  5. 3 3
      lib/neoinfra/vpcs.rb
  6. 3 1
      models/regions.rb

+ 1 - 1
Gemfile

@@ -3,9 +3,9 @@
 source 'http://rubygems.org'
 
 gem 'fog'
+gem 'mime-types'
 gem 'neo4j', '7.2.0'
 gem 'rspec'
-gem 'mime-types'
 gem 'rubytree'
 
 group :development do

+ 6 - 6
lib/neoinfra/aws.rb

@@ -42,17 +42,17 @@ module NeoInfra
       @cfg = NeoInfra::Config.new
       neo4j_url = "http://#{@cfg.neo4j[:host]}:#{@cfg.neo4j[:port]}"
       Neo4j::Session.open(:server_db, neo4j_url)
-      self.regions.each do |region|
+      regions.each do |region|
         next unless Region.where(region: region).empty?
         r = Region.new(
           region: region
         )
         r.save
-        self.azs(region).each do |az|
+        azs(region).each do |az|
           next unless Az.where(az: az).empty?
           a = Az.new(az: az)
           a.save
-          AzRegion.create(from_node: a, to_node: Region.where(region: region).first )
+          AzRegion.create(from_node: a, to_node: Region.where(region: region).first)
         end
       end
     end
@@ -73,11 +73,11 @@ module NeoInfra
           next unless Bucket.where(name: bucket.key).empty?
           b = Bucket.new(
             name: bucket.key,
-            size: cw.get_bucket_size(account[:key], account[:secret], bucket.location, bucket.key,)
+            size: cw.get_bucket_size(account[:key], account[:secret], bucket.location, bucket.key)
           )
           b.save
-          BucketRegion.create(from_node: b, to_node: Region.where(region: bucket.location).first )
-          BucketAccount.create(from_node: b, to_node: AwsAccount.where(name: account[:name]).first )
+          BucketRegion.create(from_node: b, to_node: Region.where(region: bucket.location).first)
+          BucketAccount.create(from_node: b, to_node: AwsAccount.where(name: account[:name]).first)
         end
       end
     end

+ 16 - 17
lib/neoinfra/cloudwatch.rb

@@ -8,23 +8,22 @@ module NeoInfra
   # Provide informations about the accounts available
   class Cloudwatch
     def get_bucket_size(key, secret, region, bucket)
-        conf = {
-          aws_access_key_id: key,
-          aws_secret_access_key: secret,
-          region: region
-        }
-        cwstats = Fog::AWS::CloudWatch.new(conf)
-        cwstats.get_metric_statistics({
-          'Statistics' => ['Maximum'],
-          'StartTime'  => DateTime.now-7,
-          'EndTime'    => DateTime.now,
-          'Period'     => 3600,
-          'MetricName' => 'BucketSizeBytes',
-          'Namespace'  => "AWS/S3",
-          'Dimensions' => [
-            {'Name' => 'BucketName','Value' => bucket},
-            {'Name' => 'StorageType','Value' => 'StandardStorage'}]
-        }).data[:body]['GetMetricStatisticsResult']['Datapoints'].last['Maximum']
+      conf = {
+        aws_access_key_id: key,
+        aws_secret_access_key: secret,
+        region: region
+      }
+      cwstats = Fog::AWS::CloudWatch.new(conf)
+      cwstats.get_metric_statistics('Statistics' => ['Maximum'],
+                                    'StartTime'  => DateTime.now - 7,
+                                    'EndTime'    => DateTime.now,
+                                    'Period'     => 3600,
+                                    'MetricName' => 'BucketSizeBytes',
+                                    'Namespace'  => 'AWS/S3',
+                                    'Dimensions' => [
+                                      { 'Name' => 'BucketName', 'Value' => bucket },
+                                      { 'Name' => 'StorageType', 'Value' => 'StandardStorage' }
+                                    ]).data[:body]['GetMetricStatisticsResult']['Datapoints'].last['Maximum']
     end
   end
 end

+ 8 - 9
lib/neoinfra/nodes.rb

@@ -26,7 +26,6 @@ module NeoInfra
           region_conf = { region: region }
           new_conn = Fog::Compute.new(region_conf.merge(base_conf))
           new_conn.servers.all.each do |ec2|
-
             if SshKey.where(name: ec2.key_name).empty?
               s = SshKey.new(
                 name: ec2.key_name,
@@ -38,13 +37,13 @@ module NeoInfra
 
             next unless Node.where(node_id: ec2.id).empty?
             node_name = if ec2.tags.empty?
-                         ec2.id
-                       else
-                         if ec2.tags.key? 'Name'
-                           ec2.tags['Name']
-                         else
-                           ec2.id
-                         end
+                          ec2.id
+                        else
+                          if ec2.tags.key? 'Name'
+                            ec2.tags['Name']
+                          else
+                            ec2.id
+                          end
                        end
             n = Node.new(
               name: node_name,
@@ -53,7 +52,7 @@ module NeoInfra
               public_ip: ec2.public_ip_address,
               size: ec2.flavor_id,
               state: ec2.state,
-              ami: ec2.image_id,
+              ami: ec2.image_id
             )
             n.save
             NodeAccount.create(from_node: n, to_node: AwsAccount.where(name: account[:name]).first)

+ 3 - 3
lib/neoinfra/vpcs.rb

@@ -48,7 +48,7 @@ module NeoInfra
             )
             vpc_id.save
             AccountVpc.create(from_node: vpc_id, to_node: AwsAccount.where(name: account[:name]).first)
-            VpcRegion.create(from_node: vpc_id, to_node: Region.where(region: region).first )
+            VpcRegion.create(from_node: vpc_id, to_node: Region.where(region: region).first)
           end
           # Get all Subnets
           new_conn.subnets.all.each do |subnet|
@@ -70,8 +70,8 @@ module NeoInfra
               state: subnet.state
             )
             sn.save
-            VpcSubnet.create(from_node: sn, to_node: Vpc.where(vpc_id: subnet.vpc_id).first )
-            SubnetAz.create(from_node: sn, to_node: Az.where(az: subnet.availability_zone).first )
+            VpcSubnet.create(from_node: sn, to_node: Vpc.where(vpc_id: subnet.vpc_id).first)
+            SubnetAz.create(from_node: sn, to_node: Az.where(az: subnet.availability_zone).first)
           end
         end
       end

+ 3 - 1
models/regions.rb

@@ -1,4 +1,6 @@
-#buckets frozen_string_literal: true
+# frozen_string_literal: true
+
+# buckets frozen_string_literal: true
 
 require 'neo4j'