sitefull-cloud 0.0.4 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5257926daababbafbf83a828de1ae95a9b155a4f
-  data.tar.gz: fe53ea223c4da35fee4cefc93e41ec069b93aea6
+  metadata.gz: 92e6a59aa462576c96fe758d339417d7d4b31f32
+  data.tar.gz: b306b27f8b52c8392955d57f95146f8ab95a71e8
 SHA512:
-  metadata.gz: 1f1be289d8c22195dc3af97883e009c7a25b08b0dd9c642706a5b4f78d7a66d4fb6f20458e262fea9cf8acc0a77c06a93438f0da8984b49237864a42b4a41f19
-  data.tar.gz: c03f19f7db78471d4398c546852e38169de1af331967b7e094edab0205b71338e988d1f9fb8487b8041e06b4b486800fc8884cdb8951ad6d9470843cfee141cc
+  metadata.gz: 88d5c9e983102ee97effbc0d02afc7963f34913b469b41dbd3f41724e06632a3bd44fba8c8c8c36383cdc86bc5299738c6211690a35a2a32a4ecbcc1bdc01811
+  data.tar.gz: 8a7da3c1cb275a35a0079f38c51c9dace4cc72f6433a84af33dc8a3a4d195e66a9891ece6163db328eaac3f33086f0c0996f53b5c12c9fec92b444921d7cdb48

data/lib/sitefull-cloud/auth.rb

@@ -5,7 +5,7 @@ module Sitefull
   module Cloud
     class Auth
       extend Forwardable
-      def_delegators :@auth, :token_options, :authorization_url_options
+      def_delegators :@auth, :token_options, :authorization_url_options, :required_settings
 
       def initialize(auth_type, options = {})
         @auth = auth_class(auth_type).new(options)

data/lib/sitefull-cloud/auth/azure.rb

@@ -44,6 +44,10 @@ module Sitefull
       def token_credentials_uri(options)
         sprintf(TOKEN_CREDENTIALS_URI, options[:tenant_id])
       end
+
+      def required_settings
+        super << :tenant_id
+      end
     end
   end
 end

data/lib/sitefull-cloud/auth/base.rb

@@ -13,7 +13,7 @@ module Sitefull
       MISSING_TOKEN_CREDENTIALS_URI = 'Missing Token Credentials URL'.freeze
 
       def initialize(options = {})
-        @options = validate(options)
+        @options = validate(options) if options[:validate].to_s.empty? || options[:validate]
       end
 
       def validate(options = {})
@@ -46,6 +46,11 @@ module Sitefull
       def token_credentials_uri(_)
         fail MISSING_TOKEN_CREDENTIALS_URI
       end
+
+      def required_settings
+        [:client_id, :client_secret]
+      end
+
       private
 
       def process(options = {})

data/lib/sitefull-cloud/provider.rb

@@ -1,3 +1,5 @@
+require 'net/ssh'
+
 module Sitefull
   module Cloud
     class Provider
@@ -37,12 +39,21 @@ module Sitefull
         @credentials ||= auth.credentials
       end
 
+      def key_data
+        @key_data ||= generate_key_data
+      end
+
       private
 
       def provider_module
         return self.class.provider_class(:mock) if mocked?
         @provider_module ||= self.class.provider_class(type)
       end
+
+      def generate_key_data
+        key = OpenSSL::PKey::RSA.new 2048
+        { public_key: [ key.to_blob ].pack('m0'), private_key: key.to_s }
+      end
     end
   end
 end

data/lib/sitefull-cloud/provider/amazon.rb

@@ -6,10 +6,12 @@ module Sitefull
     module Amazon
       include Networking
 
-      REQUIRED_OPTIONS = %w(role_arn region session_name).freeze
+      REQUIRED_OPTIONS = %w(role_arn session_name).freeze
       MACHINE_TYPES = %w(t2.nano t2.micro t2.small t2.medium t2.large m4.large m4.xlarge m4.2xlarge m4.4xlarge m4.10xlarge m3.medium m3.large m3.xlarge m3.2xlarge).freeze
 
       DEFAULT_REGION = 'us-east-1'.freeze
+      WAIT = 2.freeze
+      INSTANCE_RUNNING_STATE = 'running'.freeze
 
       def process(options = {})
         options[:region] ||= DEFAULT_REGION
@@ -41,23 +43,35 @@ module Sitefull
       end
 
       def create_key(name)
-        result = connection.create_key_pair(key_name: name)
-        OpenStruct.new(name: result.key_name, data: result.key_material)
+        connection.import_key_pair(key_name: name, public_key_material: "ssh-rsa #{key_data[:public_key]}")
+        OpenStruct.new(key_data)
       end
 
-      def create_firewall_rules(_)
+      def create_firewall_rules
         setup_security_group
       end
 
       # Uses http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#run_instances-instance_method
-      def create_instance(deployment)
-        connection.run_instances(image_id: deployment.image, instance_type: deployment.machine_type, subnet_id: deployment.network_id, key_name: deployment.key_name, security_group_ids: [security_group.group_id], min_count: 1, max_count: 1).instances.first.instance_id
+      def create_instance(_name, machine_type, image, network_id, key)
+        instance = connection.run_instances(image_id: image, instance_type: machine_type,
+                                            subnet_id: network_id, key_name: key.name,
+                                            security_group_ids: [security_group.group_id], min_count: 1, max_count: 1).instances.first
+        sleep WAIT unless instance(instance.instance_id).state.name == INSTANCE_RUNNING_STATE
+        instance.instance_id
+      end
+
+      def instance_data(instance_id)
+        OpenStruct.new(id: instance_id, public_ip: instance(instance_id).public_ip_address)
       end
 
       def valid?
         !connection.nil?
-      rescue StandardError
-        false
+      end
+
+      private
+
+      def instance(instance_id)
+        connection.describe_instances(instance_ids: [instance_id]).reservations.first.instances.first
       end
     end
   end

data/lib/sitefull-cloud/provider/amazon/networking.rb

@@ -2,7 +2,7 @@ module Sitefull
   module Provider
     module Amazon
       module Networking
-        TEMPLATE_TAG = 'SiteFull Deployment'.freeze
+        TEMPLATE_TAG = 'SiteFull Deployments'.freeze
         VPC_CIDR_BLOCK = '172.16.0.0/16'.freeze
         SUBNET_CIDR_BLOCK = '172.16.1.0/24'.freeze
 
@@ -43,6 +43,8 @@ module Sitefull
         def create_vpc
           vpc = connection.create_vpc(cidr_block: VPC_CIDR_BLOCK).vpc
           add_tags(vpc.vpc_id)
+          connection.modify_vpc_attribute(vpc_id: vpc.vpc_id, enable_dns_support: { value: true })
+          connection.modify_vpc_attribute(vpc_id: vpc.vpc_id, enable_dns_hostnames: { value: true })
           vpc
         end
 

data/lib/sitefull-cloud/provider/azure.rb

@@ -11,7 +11,7 @@ module Sitefull
       include Networking
       include Instance
 
-      REQUIRED_OPTIONS = %w(region subscription_id).freeze
+      REQUIRED_OPTIONS = %w(subscription_id).freeze
 
       IMAGES = {
         debian: { publisher: 'Credativ', offer: 'Debian' },
@@ -32,6 +32,9 @@ module Sitefull
       SECURITY_GROUP = 'sitefull'.freeze
       PUBLIC_IP_NAME = 'sitefull'.freeze
 
+      WAIT = 2.freeze
+      SUCCESS_PROVISIONING_STATE = 'Succeeded'.freeze
+
       def connection
         return @connection unless @connection.nil?
 
@@ -46,52 +49,62 @@ module Sitefull
       end
 
       def regions
-        @regions ||= connection.arm.providers.get('Microsoft.Compute').value!.body.resource_types.find { |rt| rt.resource_type == 'virtualMachines' }.locations.map { |l| OpenStruct.new(id: l.downcase.gsub(/\s/, ''), name: l) }
+        @regions ||= connection.arm.providers.get('Microsoft.Compute').resource_types.find { |rt| rt.resource_type == 'virtualMachines' }.locations.map { |l| OpenStruct.new(id: l.downcase.gsub(/\s/, ''), name: l) }
       end
 
       def machine_types(region)
-        @machine_types ||= connection.compute.virtual_machine_sizes.list(region).value!.body.value.map { |mt| OpenStruct.new(id: mt.name, name: mt.name) }
+        @machine_types ||= connection.compute.virtual_machine_sizes.list(region).value.map { |mt| OpenStruct.new(id: mt.name, name: mt.name) }
       end
 
       def images(os)
         @images unless @images.nil?
 
         search = IMAGES[os.to_sym]
-        image_skus = connection.compute.virtual_machine_images.list_skus(options[:region], search[:publisher], search[:offer]).value!.body
+        image_skus = connection.compute.virtual_machine_images.list_skus(options[:region], search[:publisher], search[:offer])
         @images = image_skus.map { |sku| OpenStruct.new(id: "#{search[:publisher]}:#{search[:offer]}:#{sku.name}", name: "#{search[:offer]} #{sku.name}") }
       end
 
       def create_network
-        resource_group = resource_group_setup.value!.body
+        resource_group = resource_group_setup
         security_group = security_group_setup.value!.body
         network = network_setup(resource_group, security_group).value!.body
         network.properties.subnets.last.name
       end
 
-      def create_firewall_rules(_)
+      def create_firewall_rules
         inbound_firewall_rule 'ssh', '22', 100
         inbound_firewall_rule 'http', '80', 101
         inbound_firewall_rule 'https', '443', 102
       end
 
-      def create_key(key_name)
-        OpenStruct.new(name: key_name, data: {})
+      def create_key(_)
+        OpenStruct.new(key_data)
       end
 
-      def create_instance(deployment)
-        name = "sitefull-deployment-#{deployment.id}"
-        subnet = connection.network.subnets.get(resource_group_name, NETWORK_NAME, SUBNET_NAME).value!.body
-        security_group = connection.network.network_security_groups.get(resource_group_name, SECURITY_GROUP).value!.body
+      def create_instance(name, machine_type, image, network_id, key)
+        subnet = connection.network.subnets.get(resource_group_name, NETWORK_NAME, network_id)
+        security_group = connection.network.network_security_groups.get(resource_group_name, SECURITY_GROUP)
         public_ip = public_ip_setup(name).value!.body
         network_interface = network_interface_setup(subnet, security_group, public_ip, name).value!.body
-        storage = storage_setup(name)
-        instance_setup(storage, network_interface, deployment.machine_type, deployment.image, name).value!.body.name
+
+        storage_setup(name)
+        sleep WAIT unless storage_account(name).properties.provisioning_state == SUCCESS_PROVISIONING_STATE
+        storage = storage_account(name)
+
+        instance_data = {machine_type: machine_type, image: image, name: name, key: key}
+        instance_id = instance_setup(storage, network_interface, instance_data).value!.body.name
+        sleep WAIT unless instance(instance_id).properties.provisioning_state == SUCCESS_PROVISIONING_STATE
+        instance_id
+      end
+
+      def instance_data(instance_id)
+        OpenStruct.new(id: instance_id, public_ip: public_ip(instance_id))
       end
 
       def valid?
-        !options[:subscription_id].empty? && !connection.empty?
-      rescue StandardError
-        false
+        !options[:subscription_id].empty? && !connection.empty? && !regions.empty?
+      rescue MsRestAzure::AzureOperationError => e
+        raise StandardError.new JSON.parse(e.response.body)['error']['message']
       end
 
       private
@@ -105,9 +118,6 @@ module Sitefull
         resource_group.location = options[:region]
         connection.arm.resource_groups.create_or_update(resource_group_name, resource_group)
       end
-
-      def image_skus
-      end
     end
   end
 end

data/lib/sitefull-cloud/provider/azure/instance.rb

@@ -10,9 +10,9 @@ module Sitefull
         include ::Azure::ARM::Network::Models
         include ::Azure::ARM::Storage::Models
 
-        STORAGE_ACCOUNT_TYPE = 'Standard_LRS'.freeze
 
         private
+
         def network_interface_setup(subnet, security_group, public_ip, name)
           ip_configuration_props = NetworkInterfaceIPConfigurationPropertiesFormat.new
           ip_configuration_props.private_ipallocation_method = 'Dynamic'
@@ -51,45 +51,64 @@ module Sitefull
           connection.network.public_ipaddresses.create_or_update(resource_group_name, name, public_ip)
         end
 
+        def public_ip(name)
+          connection.network.public_ipaddresses.get(resource_group_name, name).properties.ip_address
+        end
+
         def storage_setup(name)
-          storage_account = connection.storage.storage_accounts.list_by_resource_group(resource_group_name).value!.body.value.find { |sa| sa.name == storage_account_name(name) }
+          storage_account = storage_account(name)
           return storage_account unless storage_account.nil?
 
           properties = StorageAccountPropertiesCreateParameters.new
-          properties.account_type = STORAGE_ACCOUNT_TYPE
+
+          sku = Sku.new
+          sku.name = 'Standard_LRS'
+          sku.tier = 'Standard'
 
           params = StorageAccountCreateParameters.new
           params.properties = properties
+          params.sku = sku
+          params.kind = 'Storage'
           params.location = options[:region]
 
           connection.storage.storage_accounts.create(resource_group_name, storage_account_name(name), params).value!.body
         end
 
-        def instance_setup(storage, network_interface, machine_type, image, name)
+        def storage_account(name)
+          connection.storage.storage_accounts.list_by_resource_group(resource_group_name).value.find { |sa| sa.name == storage_account_name(name) }
+        end
+
+        def instance_setup(storage, network_interface, instance_data)
           # Create a model for new virtual machine
           props = VirtualMachineProperties.new
 
           #windows_config = WindowsConfiguration.new
           #windows_config.provision_vmagent = true
           #windows_config.enable_automatic_updates = true
+
+          ssh_key = SshPublicKey.new
+          ssh_key.path = "/home/#{instance_data[:key].ssh_user}/.ssh/authorized_keys"
+          ssh_key.key_data = "ssh-rsa #{instance_data[:key].public_key} #{instance_data[:key].ssh_user}"
+
+          ssh_config = SshConfiguration.new
+          ssh_config.public_keys = [ssh_key]
+
           linux_config = LinuxConfiguration.new
-          linux_config.disable_password_authentication = false
+          linux_config.ssh = ssh_config
+          linux_config.disable_password_authentication = true
 
           os_profile = OSProfile.new
-          os_profile.computer_name = name
-          os_profile.admin_username = 'sitefull'
-          os_profile.admin_password = 'P@ssword1'
+          os_profile.computer_name = instance_data[:name]
+          os_profile.admin_username = instance_data[:key].ssh_user
           os_profile.linux_configuration = linux_config
-          # os_profile.custom_data = Base64.strict_encode64("#!/bin/sh\necho \"Hello World!\"").encode('utf-8')
 
-          os_profile.secrets = []
           props.os_profile = os_profile
 
           hardware_profile = HardwareProfile.new
-          hardware_profile.vm_size = machine_type
+          hardware_profile.vm_size = instance_data[:machine_type]
           props.hardware_profile = hardware_profile
 
-          props.storage_profile = create_storage_profile(image, storage.name)
+          props.storage_profile = create_storage_profile(instance_data[:image], storage.name)
 
           network_profile = NetworkProfile.new
           network_profile.network_interfaces = [network_interface]
@@ -100,7 +119,11 @@ module Sitefull
           params.properties = props
           params.location = options[:region]
 
-          connection.compute.virtual_machines.create_or_update(resource_group_name, name, params)
+          connection.compute.virtual_machines.create_or_update(resource_group_name, instance_data[:name], params)
+        end
+
+        def instance(instance_id)
+          connection.compute.virtual_machines.get(resource_group_name, instance_id)
         end
 
         def create_storage_profile(image, name)

data/lib/sitefull-cloud/provider/google.rb

@@ -1,9 +1,13 @@
 require 'google/apis/compute_v1'
+Google::Apis::RequestOptions.default.retries = 5
 
 module Sitefull
   module Provider
     module Google
-      REQUIRED_OPTIONS = [:project_name].freeze
+      REQUIRED_OPTIONS = %w(project_name).freeze
+
+      WAIT = 2.freeze
+      INSTANCE_RUNNING_STATE = 'RUNNING'.freeze
 
       def connection
         return @connection unless @connection.nil?
@@ -38,28 +42,32 @@ module Sitefull
         connection.insert_network(project_name, network).target_link
       end
 
-      def create_firewall_rules(network_id)
+      def create_firewall_rules
         create_firewall_rule(network_id, 'sitefull-ssh', '22')
         create_firewall_rule(network_id, 'sitefull-http', '80')
         create_firewall_rule(network_id, 'sitefull-https', '443')
-        network_id
       end
 
-      def create_key(_name)
-        OpenStruct.new(name: :key_name, data: :key_material)
+      def create_key(_)
+        OpenStruct.new(key_data)
+      end
+
+      def create_instance(name, machine_type, image, network_id, key)
+        instance = ::Google::Apis::ComputeV1::Instance.new(name: name, machine_type: machine_type,
+                                                           disks: [{ boot: true, autoDelete: true, initialize_params: { source_image: image } }],
+                                                           network_interfaces: [{ network: network_id, access_configs: [{ name: 'default' }] }],
+                                                           metadata: { items: [{ key: 'ssh-keys', value: "#{key.ssh_user}:ssh-rsa #{key.public_key} #{key.ssh_user}"}] })
+        connection.insert_instance(project_name, options[:region], instance).target_link
+        sleep WAIT unless instance(name).status == INSTANCE_RUNNING_STATE
+        name
       end
 
-      def create_instance(deployment)
-        instance = ::Google::Apis::ComputeV1::Instance.new(name: "sitefull-deployment-#{deployment.id}", machine_type: deployment.machine_type,
-                                                           disks: [{ boot: true, autoDelete: true, initialize_params: { source_image: deployment.image } }],
-                                                           network_interfaces: [{ network: deployment.network_id, access_configs: [{ name: 'default' }] }])
-        connection.insert_instance(project_name, deployment.region, instance).target_link
+      def instance_data(instance_id)
+        OpenStruct.new(id: instance_id, public_ip: instance(instance_id).network_interfaces.first.access_configs.first.nat_ip)
       end
 
       def valid?
         regions.any?
-      rescue StandardError
-        false
       end
 
       private
@@ -70,10 +78,15 @@ module Sitefull
       end
 
       def create_firewall_rule(network_id, rule_name, port)
+        return if firewall_rule_exists?(rule_name)
         rule = ::Google::Apis::ComputeV1::Firewall.new(name: rule_name, source_ranges: ['0.0.0.0/0'], network: network_id, allowed: [{ ip_protocol: 'tcp', ports: [port] }])
         connection.insert_firewall(project_name, rule)
+      end
+
+      def firewall_rule_exists?(rule_name)
+        connection.get_firewall(project_name, rule_name)
       rescue ::Google::Apis::ClientError
-        nil
+        false
       end
 
       def network_id
@@ -81,6 +94,10 @@ module Sitefull
       rescue ::Google::Apis::ClientError
         nil
       end
+
+      def instance(instance_id)
+        connection.get_instance(project_name, options[:region], instance_id)
+      end
     end
   end
 end

data/lib/sitefull-cloud/provider/mock.rb

@@ -17,17 +17,21 @@ module Sitefull
         'network-id'
       end
 
-      def create_key(name)
-        OpenStruct.new(name: name, data: 'key-data')
+      def create_key(_name)
+        OpenStruct.new(ssh_user: 'ssh_user', public_key: 'public_key', private_key: 'private_key')
       end
 
-      def create_firewall_rules(_)
+      def create_firewall_rules
       end
 
-      def create_instance(_)
+      def create_instance(_, _, _, _, _)
         'instance-id'
       end
 
+      def instance_data(instance_id)
+        OpenStruct.new(id: instance_id, public_ip: 'public_ip')
+      end
+
       def valid?
         true
       end

data/lib/sitefull-cloud/version.rb

@@ -1,5 +1,5 @@
 module Sitefull
   module Cloud
-    VERSION = '0.0.4'
+    VERSION = '0.1'
   end
 end

data/sitefull-cloud.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'azure_mgmt_resources'
   spec.add_dependency 'azure_mgmt_storage'
   spec.add_dependency 'activesupport'
+  spec.add_dependency 'net-ssh'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitefull-cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: '0.1'
 platform: ruby
 authors:
 - Stanimir Dimitrov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement