jellyfish-fog 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d04e61608cc847611bbdbc2b46cc2ab0e225d4f1
-  data.tar.gz: 4fe07b73bbe512316d6c235918ea7fb67e6c03b2
+  metadata.gz: 5d38b47d38c5b70280e9033193a6d3eceb17c539
+  data.tar.gz: fd1ff2ac3530d6187b0e105c6f12d77f29d68050
 SHA512:
-  metadata.gz: 1237e4605d6390e0aa705607099cd4003ac5b3e445b2fc66b628eac76cf5a5369afa421f9953ff059481cb09a08e4c5ff51da994f53498f8120a2eceef188570
-  data.tar.gz: a70b5bbc020d18b39a9463e545c48ff535b8109f4e64ff54e93fc094184e1be4fac8087ef93ac0d9be6217f8bd4669d2fcc660f0d2aad7c741eae64a03fa4718
+  metadata.gz: e8d5140434682bce5f8d466f6536a4900558f96ccb0472c23a35b9d0bb89c97dc0022750b23d45d8c5a97e901ba497853bec764b6b15ec8f637b506ee69ca78a
+  data.tar.gz: 06c8b686f287daf8d7e21af8bb127c3fc26762cfe4bd4c5b4adb7386a4b71204f61c9252a30649ae0c56605f010de35f9daeed89cbe4edde4233cfd64d6da756

data/config/product_questions/aws_database.json

@@ -1,7 +1,7 @@
 {
   "type": "object",
-  "title": "AWS Fog Databases",
-  "description": "AWS Fog Databases",
+  "title": "AWS Fog Database",
+  "description": "AWS Fog Database",
   "required": ["DBInstanceClass", "Engine", "AllocatedStorage"],
   "properties": {
     "DBInstanceClass": {

data/config/product_questions/aws_ebs.json

@@ -0,0 +1,19 @@
+{
+  "type": "object",
+  "title": "AWS Fog EBS",
+  "description": "AWS Fog EBS",
+  "required": [],
+  "properties": {
+    "size": {
+      "title": "Size",
+      "type": "string",
+      "default": "5"
+    },
+    "availability_zone": {
+      "title": "Availability Zone",
+      "type": "string",
+      "default": "us-east-1a"
+    }
+  }
+}
+

data/config/product_questions/aws_infrastructure.json

@@ -2,15 +2,15 @@
   "type": "object",
   "title": "AWS Fog Infrastructure",
   "description": "AWS Fog Infrastructure",
-  "required": ["ami_id", "instance_size", "disk_size"],
+  "required": ["ami_id", "flavor_id", "disk_size"],
   "properties": {
     "ami_id": {
       "title": "AMI ID",
       "type": "string",
       "default": "ami-1ccae774"
     },
-    "instance_size": {
-      "title": "Instance Size",
+    "flavor_id": {
+      "title": "Flavor Id",
       "type": "string",
       "enum": [
         "t2.micro",
@@ -23,6 +23,21 @@
       "title": "Disk Size",
       "type": "string",
       "default": "40"
+    },
+    "vpc_id": {
+      "title": "VPC ID",
+      "type": "string",
+      "default": ""
+    },
+    "subnet_id": {
+      "title": "Subnet ID",
+      "type": "string",
+      "default": ""
+    },
+    "security_group_ids": {
+      "title": "Security Group IDs",
+      "type": "string",
+      "default": ""
     }
   }
 }

data/config/product_questions/aws_security_group.json

@@ -0,0 +1,24 @@
+{
+  "type": "object",
+  "title": "AWS Fog Security Group",
+  "description": "AWS Fog Security Group",
+  "required": [],
+  "properties": {
+    "name": {
+      "title": "Name",
+      "type": "string",
+      "default": "jellyfish"
+    },
+    "description": {
+      "title": "Description",
+      "type": "string",
+      "default": "jellyfish users"
+    },
+    "vpc_id": {
+      "title": "VPC ID",
+      "type": "string",
+      "default": ""
+    }
+  }
+}
+

data/config/product_questions/aws_storage.json

@@ -2,30 +2,12 @@
   "type": "object",
   "title": "AWS Fog Storage",
   "description": "AWS Fog Storage",
-  "required": ["availability", "region"],
+  "required": [],
   "properties": {
-    "availability": {
-      "title": "Storage Redundancy",
+    "name": {
+      "title": "S3 Bucket Name",
       "type": "string",
-      "enum": [
-        "normal",
-        "reduced"
-      ],
-      "default": "normal"
-    },
-    "region": {
-      "title": "DB Engine",
-      "type": "string",
-      "enum": [
-        "",
-        "us-west-1",
-        "us-west-2",
-        "EU",
-        "ap-northeast-1",
-        "ap-southeast-1",
-        "ap-southeast-2"
-      ],
-      "default": ""
+      "default": "jellyfish"
     }
   }
 }

data/config/product_questions/aws_subnet.json

@@ -0,0 +1,19 @@
+{
+  "type": "object",
+  "title": "AWS Fog Subnet",
+  "description": "AWS Fog Subnet",
+  "required": [],
+  "properties": {
+    "vpc_id": {
+      "title": "VPC ID",
+      "type": "string",
+      "default": "vpc-885fc5ed"
+    },
+    "cidr_block": {
+      "title": "CIDR Block",
+      "type": "string",
+      "default": "172.31.247.0/24"
+    }
+  }
+}
+

data/config/product_questions/aws_vpc.json

@@ -0,0 +1,14 @@
+{
+  "type": "object",
+  "title": "AWS Fog VPC",
+  "description": "AWS Fog VPC",
+  "required": [],
+  "properties": {
+    "cidr_block": {
+      "title": "Cidr Block",
+      "type": "string",
+      "default": "10.0.0.0/16"
+    }
+  }
+}
+

data/config/provisioners.json

@@ -1,7 +1,11 @@
 {
-  "AWS Fog Databases": "Jellyfish::Fog::AWS::Databases",
+  "AWS Fog Database": "Jellyfish::Fog::AWS::Database",
   "AWS Fog Storage": "Jellyfish::Fog::AWS::Storage",
   "AWS Fog Infrastructure": "Jellyfish::Fog::AWS::Infrastructure",
+  "AWS Fog VPC": "Jellyfish::Fog::AWS::VPC",
+  "AWS Fog Subnet": "Jellyfish::Fog::AWS::Subnet",
+  "AWS Fog Security Group": "Jellyfish::Fog::AWS::SecurityGroup",
+  "AWS Fog EBS": "Jellyfish::Fog::AWS::EBS",
   "Azure Fog Infrastructure": "Jellyfish::Fog::Azure::Infrastructure",
   "VMWare Fog Infrastructure": "Jellyfish::Fog::VMWare::Infrastructure"
 }

data/lib/jellyfish_fog.rb

@@ -6,8 +6,12 @@ require 'bcrypt'
 require 'jellyfish_fog/engine'
 require 'jellyfish_fog/provisioner'
 require 'jellyfish_fog/infrastructure'
-require 'jellyfish_fog/databases'
+require 'jellyfish_fog/security_group'
+require 'jellyfish_fog/database'
 require 'jellyfish_fog/storage'
+require 'jellyfish_fog/subnet'
+require 'jellyfish_fog/vpc'
+require 'jellyfish_fog/ebs'
 
 module Jellyfish
   module Fog

data/lib/jellyfish_fog/database.rb

@@ -0,0 +1,60 @@
+require 'bcrypt'
+
+module Jellyfish
+  module Fog
+    module AWS
+      class Database < Jellyfish::Provisioner
+        def provision
+          db = nil
+          handle_errors do
+            # GENERATE PASSWORD AND INSTANCE ID
+            @password = SecureRandom.hex(5)
+            db_instance_id = "id-#{@order_item.uuid[0..9]}"
+
+            # CREATE DB INSTANCE
+            db = connection.create_db_instance(db_instance_id, details)
+
+            # POPULATE PAYLOAD RESPONSE TEMPLATE
+            payload_response = payload_response_template
+            payload_response[:raw] = db
+
+            # INCLUDE IPADDRESS IF PRESENT
+            payload_response[:defaults][:ip_address] = db.local_address unless db.local_address.nil?
+
+            @order_item.provision_status = :ok
+            @order_item.payload_response = payload_response
+          end
+        end
+
+        def retire(skip_final_snap_shot = true)
+          handle_errors do
+            snapshot_id = skip_final_snap_shot ? '' : snapshot
+            connection.delete_db_instance(identifier, snapshot_id, skip_final_snap_shot)
+          end
+          @order_item.provision_status = :retired
+        end
+
+        private
+
+        def details
+          @order_item.answers.merge(
+            'MasterUserPassword' => @password,
+            'MasterUsername' => 'admin'
+          )
+        end
+
+        def connection
+          ::Fog::AWS::RDS.new(Jellyfish::Fog::AWS.settings.except(:provider))
+        end
+
+        def identifier
+          @order_item.payload_response['raw']['data']['body']['CreateDBInstanceResult']['DBInstance']['DBInstanceIdentifier']
+        end
+
+        def snapshot
+          "snapshot-#{@order_item.uuid[0..5]}"
+        end
+      end
+    end
+  end
+end

data/lib/jellyfish_fog/ebs.rb

@@ -0,0 +1,40 @@
+module Jellyfish
+  module Fog
+    module AWS
+      class EBS < Jellyfish::Provisioner
+        def provision
+          server = nil
+
+          handle_errors do
+            server = connection.volumes.new(details)
+            server.save
+          end
+
+          # POPULATE PAYLOAD RESPONSE TEMPLATE
+          payload_response = payload_response_template
+          payload_response[:raw] = JSON.parse(server.to_json)
+
+          @order_item.provision_status = :ok
+          @order_item.payload_response = payload_response
+        end
+
+        def retire
+          handle_errors do
+            connection.volumes.get(server_identifier).destroy
+          end
+          @order_item.provision_status = :retired
+        end
+
+        private
+
+        def connection
+          ::Fog::Compute.new(Jellyfish::Fog::AWS.settings)
+        end
+
+        def server_identifier
+          @order_item.payload_response['raw']['id']
+        end
+      end
+    end
+  end
+end

data/lib/jellyfish_fog/infrastructure.rb

@@ -28,16 +28,26 @@ module Jellyfish
           server = nil
 
           handle_errors do
+            details['vpc_id'] = nil if details['vpc_id'].blank?
+            details['subnet_id'] = nil if details['subnet_id'].blank?
+            details['security_group_ids'] = nil if details['security_group_ids'].blank?
             server = connection.servers.create(details).tap { |s| s.wait_for { ready? } }
           end
 
+          # POPULATE PAYLOAD RESPONSE TEMPLATE
+          payload_response = payload_response_template
+          payload_response[:raw] = JSON.parse(server.to_json)
+
+          # INCLUDE IPADDRESS IF PRESENT
+          payload_response[:defaults][:ip_address] = server.public_ip_address unless server.public_ip_address.nil?
+
           @order_item.provision_status = :ok
-          @order_item.payload_response = server.to_json
+          @order_item.payload_response = payload_response
         end
 
         def retire
           handle_errors do
-            connection.servers.delete(server_identifier)
+            connection.servers.get(server_identifier).destroy
           end
           @order_item.provision_status = :retired
         end
@@ -49,7 +59,7 @@ module Jellyfish
         end
 
         def server_identifier
-          @order_item.payload_response['id']
+          @order_item.payload_response['raw']['id']
         end
       end
     end

data/lib/jellyfish_fog/security_group.rb

@@ -0,0 +1,45 @@
+module Jellyfish
+  module Fog
+    module AWS
+      class SecurityGroup < Jellyfish::Provisioner
+        def provision
+          server = nil
+
+          handle_errors do
+            # create_security_group(name, description, vpc_id = nil)
+            details['vpc_id'] = nil if details['vpc_id'].blank?
+            server = connection.create_security_group(details['name'], details['description'], details['vpc_id'])
+          end
+
+          # POPULATE PAYLOAD RESPONSE TEMPLATE
+          payload_response = payload_response_template
+          payload_response[:raw] = server
+
+          # INCLUDE IPADDRESS IF PRESENT
+          payload_response[:defaults][:ip_address] = server.local_address unless server.local_address.nil?
+
+          @order_item.provision_status = :ok
+          @order_item.payload_response = payload_response
+        end
+
+        def retire
+          handle_errors do
+            security_group_name = nil
+            connection.delete_security_group(security_group_name, server_identifier)
+          end
+          @order_item.provision_status = :retired
+        end
+
+        private
+
+        def connection
+          ::Fog::Compute.new(Jellyfish::Fog::AWS.settings)
+        end
+
+        def server_identifier
+          @order_item.payload_response['raw']['data']['body']['groupId']
+        end
+      end
+    end
+  end
+end

data/lib/jellyfish_fog/storage.rb

@@ -3,22 +3,26 @@ module Jellyfish
     module AWS
       class Storage < Jellyfish::Provisioner
         def provision
-          instance_name = "id-#{order_item.uuid[0..9]}"
-          begin
-            storage = connection.directories.create(key: instance_name, public: true)
-          rescue Excon::Errors::BadRequest, Excon::Errors::Forbidden => e
-            raise e, 'Bad request. Check for valid credentials and proper permissions.', e.backtrace
+          storage = nil
+
+          handle_errors do
+            storage_name = "id-#{order_item.uuid[0..9]}"
+            storage = connection.directories.create(key: storage_name)
           end
 
-          order_item.payload_response = storage.to_json
-          order_item.provision_status = 'ok'
+          # POPULATE PAYLOAD RESPONSE TEMPLATE
+          payload_response = payload_response_template
+          payload_response[:raw] = JSON.parse(storage.to_json)
+
+          @order_item.provision_status = :ok
+          @order_item.payload_response = payload_response
         end
 
         def retire
-          connection.delete_bucket(storage_key)
-          order_item.provision_status = 'retired'
-        rescue Excon::Errors::BadRequest, Excon::Errors::Forbidden => e
-          raise e, 'Bad request. Check for valid credentials and proper permissions.', e.backtrace
+          handle_errors do
+            connection.delete_bucket(identifier)
+          end
+          order_item.provision_status = :retired
         end
 
         private
@@ -27,8 +31,8 @@ module Jellyfish
           ::Fog::Storage.new(Jellyfish::Fog::AWS.settings)
         end
 
-        def storage_key
-          order_item.payload_response['key']
+        def identifier
+          @order_item.payload_response['raw']['key']
         end
       end
     end

data/lib/jellyfish_fog/subnet.rb

@@ -0,0 +1,42 @@
+module Jellyfish
+  module Fog
+    module AWS
+      class Subnet < Jellyfish::Provisioner
+        def provision
+          server = nil
+
+          handle_errors do
+            server = connection.create_subnet(details['vpc_id'], details['cidr_block'])
+          end
+
+          # POPULATE PAYLOAD RESPONSE TEMPLATE
+          payload_response = payload_response_template
+          payload_response[:raw] = server
+
+          # INCLUDE IP_ADDRESS IF PRESENT
+          payload_response[:defaults][:ip_address] = server.local_address unless server.local_address.nil?
+
+          @order_item.provision_status = :ok
+          @order_item.payload_response = payload_response
+        end
+
+        def retire
+          handle_errors do
+            connection.delete_subnet(server_identifier)
+          end
+          @order_item.provision_status = :retired
+        end
+
+        private
+
+        def connection
+          ::Fog::Compute.new(Jellyfish::Fog::AWS.settings)
+        end
+
+        def server_identifier
+          @order_item.payload_response['raw']['data']['body']['subnet']['subnetId']
+        end
+      end
+    end
+  end
+end

data/lib/jellyfish_fog/version.rb

@@ -1,5 +1,5 @@
 module Jellyfish
   module Fog
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/lib/jellyfish_fog/vpc.rb

@@ -0,0 +1,42 @@
+module Jellyfish
+  module Fog
+    module AWS
+      class VPC < Jellyfish::Provisioner
+        def provision
+          server = nil
+
+          handle_errors do
+            server = connection.create_vpc(details['cidr_block'])
+          end
+
+          # POPULATE PAYLOAD RESPONSE TEMPLATE
+          payload_response = payload_response_template
+          payload_response[:raw] = server
+
+          # INCLUDE IPADDRESS IF PRESENT
+          payload_response[:defaults][:ip_address] = server.local_address unless server.local_address.nil?
+
+          @order_item.provision_status = :ok
+          @order_item.payload_response = payload_response
+        end
+
+        def retire
+          handle_errors do
+            connection.delete_vpc(server_identifier)
+          end
+          @order_item.provision_status = :retired
+        end
+
+        private
+
+        def connection
+          ::Fog::Compute.new(Jellyfish::Fog::AWS.settings)
+        end
+
+        def server_identifier
+          @order_item.payload_response['raw']['data']['body']['vpcSet'][0]['vpcId']
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish-fog
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - mafernando
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,19 +137,27 @@ files:
 - config/initializers/product_types.rb
 - config/initializers/provisioners.rb
 - config/product_questions/aws_database.json
+- config/product_questions/aws_ebs.json
 - config/product_questions/aws_infrastructure.json
+- config/product_questions/aws_security_group.json
 - config/product_questions/aws_storage.json
+- config/product_questions/aws_subnet.json
+- config/product_questions/aws_vpc.json
 - config/product_questions/azure_infrastructure.json
 - config/product_questions/vmware_infrastructure.json
 - config/provisioners.json
 - lib/jellyfish-fog.rb
 - lib/jellyfish_fog.rb
-- lib/jellyfish_fog/databases.rb
+- lib/jellyfish_fog/database.rb
+- lib/jellyfish_fog/ebs.rb
 - lib/jellyfish_fog/engine.rb
 - lib/jellyfish_fog/infrastructure.rb
 - lib/jellyfish_fog/provisioner.rb
+- lib/jellyfish_fog/security_group.rb
 - lib/jellyfish_fog/storage.rb
+- lib/jellyfish_fog/subnet.rb
 - lib/jellyfish_fog/version.rb
+- lib/jellyfish_fog/vpc.rb
 - lib/tasks/jellyfish_fog_tasks.rake
 homepage: http://www.projectjellyfish.org/
 licenses:

data/lib/jellyfish_fog/databases.rb

@@ -1,47 +0,0 @@
-require 'bcrypt'
-
-module Jellyfish
-  module Fog
-    module AWS
-      class Databases < Jellyfish::Provisioner
-        def provision
-          @password = SecureRandom.hex(5)
-          db_instance_id = "id-#{@order_item.uuid[0..9]}"
-          handle_errors do
-            db = connection.create_db_instance(db_instance_id, details)
-            @order_item.payload_response = db.to_json
-            @order_item.provision_status = 'ok'
-          end
-        end
-
-        def retire
-          connection.delete_db_instance(identifier, snapshot, false)
-          @order_item.provision_status = 'retired'
-        rescue Excon::Errors::BadRequest, Excon::Errors::Forbidden => e
-          raise e, 'Bad request. Check for valid credentials and proper permissions.', e.backtrace
-        end
-
-        private
-
-        def details
-          @order_item.answers.merge(
-            'MasterUserPassword' => @password,
-            'MasterUsername' => 'admin'
-          )
-        end
-
-        def connection
-          ::Fog::AWS::RDS.new(Jellyfish::Fog::AWS.settings.except(:provider))
-        end
-
-        def identifier
-          @order_item.payload_response['data']['body']['CreateDBInstanceResult']['DBInstance']['DBInstanceIdentifier']
-        end
-
-        def snapshot
-          "snapshot-#{@order_item.uuid[0..5]}"
-        end
-      end
-    end
-  end
-end