lds-cf-plugin 0.4.0 → 0.4.1

data/lib/lds-cf-plugin/enterprise_ws_service.rb

@@ -0,0 +1,110 @@
+require "cf/cli"
+require "json"
+require "uri"
+
+module LdsCfPlugin
+  class EnterpriseWSService < CF::CLI
+    def precondition
+      check_target
+    end
+
+    desc "Create an Enterprise WS service"
+    group :lds, :services
+    input :name, :desc => "Name for your service", :argument => :optional
+    input :env, :desc => "The environment of enterprise web services you wish to use.", :argument => :optional
+    input :username, :desc => "The enterprise web services username to use.", :argument => :optional
+    input :password, :desc => "The enterprise web services password to use.", :argument => :optional
+
+    def create_enterprise_ws_service
+      offerings = client.services
+      offerings.keep_if { |s| s.label == 'enterprise-ws-service' && s.provider == 'ICS' }
+      service = offerings.first
+
+      if !service
+        fail "Cannot find the Enterprise WS service on #{client.target}"
+      end
+      
+      if service.version != "0.1"
+        fail "Your lds-cf-plugin version is out of date.  To update execute `gem update lds-cf-plugin`"
+      end
+
+      rest_client = CFoundry::RestClient.new(service.url, client.token)
+      rest_client.trace = client.trace
+
+      instance_name = input[:name]
+      if !instance_name
+        instance_name = ask("Name")
+      end
+
+      plan = service.service_plans.first
+
+      choices = ["int", "load", "prod"]
+      
+      env = input[:env]
+      if !env || !choices.include?(env)
+        options = {
+          :choices => choices,
+          :display => proc { |choice|
+            if choice == "int"
+              "Integration"
+            elsif choice == "load"
+              "Load"
+            elsif choice == "prod"
+              "Production"
+            end
+          },
+          :default => "int",
+          :allow_other => false
+        }
+        env = ask("Enterprise Web Services environment to use", options)
+      end
+      
+      username = input[:username]
+      if !username
+        username = ask("Username")
+      end
+
+      password = input[:password]
+      if !password
+        password = ask("Password", :echo => "*", :forget => true, :default => "")
+      end
+
+      # Register service with gateway
+
+      payload = {
+          :space_guid => client.current_space.guid,
+          :name => instance_name,
+          :env => env,
+          :username => username,
+          :password => password
+      }
+
+      options = {
+          :payload => JSON.generate(payload)
+      }
+      request, response = rest_client.request("POST", "/register", options)
+      if response[:status].to_i != 200
+        fail "Error registering Enterprise WS service with broker:\n#{response[:body]}"
+      end
+      
+      # Create service instance
+      instance = client.managed_service_instance
+      instance.name = instance_name
+
+      instance.service_plan = plan
+      instance.space = client.current_space
+
+      with_progress("Creating service #{c(instance.name, :name)}") do
+        instance.create!
+      end
+
+      result = JSON.parse(response[:body])
+      line "Detected access to:"
+      result['services'].each do |service|
+        line "* #{service}"
+      end
+
+      instance
+    end
+  end
+end

data/lib/lds-cf-plugin/oracle_service.rb

@@ -9,10 +9,11 @@ module LdsCfPlugin
 
     desc "Create an Oracle service"
     group :lds, :services
+    input :plan, :desc => "The plan for your service.  (Existing, or Provisioned)", :argument => :optional 
     input :name, :desc => "Name for your service", :argument => :optional
-    input :service, :desc => "The Oracle database to connect to", :argument => :optional
-    input :schema, :desc => "The schema (user) to use", :argument => :optional
-    input :password, :desc => "The password used to connect to the database", :argument => :optional
+    input :service, :desc => "The Oracle database to connect to if using 'Existing' plan.", :argument => :optional
+    input :schema, :desc => "The schema (user) to use if using 'Existing' plan.", :argument => :optional
+    input :password, :desc => "The password used to connect to the database if using 'Existing' plan.", :argument => :optional
 
     def create_oracle_service
       offerings = client.services
@@ -35,46 +36,83 @@ module LdsCfPlugin
         instance_name = ask("Name")
       end
 
-      plan = service.service_plans.first
-
-      service = input[:service]
-      if !service
-        service = ask("Oracle service (database name/alias)")
-      end
+      plans = service.service_plans
+      
+      selected_plan = nil
 
-      schema = input[:schema]
-      if !schema
-        schema = ask("Oracle schema (user)")
+      plans.each do |plan|
+        selcted_plan = plan if plan.name == input[:plan] 
+      end unless input[:plan].nil?
+      
+      existing_plan = nil?
+      plans.each do | plan |
+        existing_plan = plan if plan.name == "Existing"
       end
-
-      password = input[:password]
-      if !password
-        password = ask("Oracle schema password", :echo => "*", :forget => true)
+      
+      plan_type = nil
+      plan_type = "Existing" unless existing_plan.nil?
+      
+      if(plans.length > 1 && !existing_plan.nil? && selected_plan.nil?)
+        choices = ["Existing", "Create New"]
+        options = {
+          :choices => choices,
+          :default => "Existing",
+          :allow_other => false
+        }
+        plan_type = ask("What type of Oracle Service", options)
       end
 
-      # Register service with gateway
-
-      payload = {
-          :space_guid => client.current_space.guid,
-          :name => instance_name,
-          :service => service,
-          :schema => schema,
-          :password => password
-      }
-      options = {
-          :payload => JSON.generate(payload)
-      }
-      request, response = rest_client.request("POST", "/register", options)
-      if response[:status].to_i != 200
-        fail "Error registering Oracle service with gateway:\n#{response[:body]}"
+      if plan_type == "Existing"
+        selected_plan = existing_plan
+        
+        service = input[:service]
+        if !service
+          service = ask("Oracle service (database name/alias)")
+        end
+  
+        schema = input[:schema]
+        if !schema
+          schema = ask("Oracle schema (user)")
+        end
+  
+        password = input[:password]
+        if !password
+          password = ask("Oracle schema password", :echo => "*", :forget => true)
+        end
+        
+        # Register service with gateway
+  
+        payload = {
+            :space_guid => client.current_space.guid,
+            :name => instance_name,
+            :service => service,
+            :schema => schema,
+            :password => password
+        }
+        options = {
+            :payload => JSON.generate(payload)
+        }
+        request, response = rest_client.request("POST", "/register", options)
+        if response[:status].to_i != 200
+          fail "Error registering Oracle service with gateway:\n#{response[:body]}"
+        end
+      else
+        plans.delete(existing_plan) unless existing_plan.nil?
+        options = {
+          :choices => plans,
+          :display => proc { |choice|
+            "#{choice.name}: #{choice.description}"
+          },
+          :allow_other => false
+        }
+        selected_plan = ask("What type of Schema do you want", options)
       end
 
-
       # Create service instance
       instance = client.managed_service_instance
       instance.name = instance_name
 
-      instance.service_plan = plan
+      instance.service_plan = selected_plan
       instance.space = client.current_space
 
       with_progress("Creating service #{c(instance.name, :name)}") do

data/lib/lds-cf-plugin/plugin.rb

@@ -8,6 +8,7 @@ Mothership::Help.groups(
 
 require "lds-cf-plugin/app_dynamics_service"
 require "lds-cf-plugin/custom_service"
+require "lds-cf-plugin/enterprise_ws_service"
 require "lds-cf-plugin/oracle_service"
 require "lds-cf-plugin/lds_account_service"
 require "lds-cf-plugin/http_service"

data/lib/lds-cf-plugin/version.rb

@@ -1,3 +1,3 @@
 module LdsCfPlugin
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.1".freeze
 end

data/lib/lds-cf-plugin/wam_service.rb

@@ -7,7 +7,7 @@ module LdsCfPlugin
       check_target
     end
 
-    desc "Create a Wam Service"
+    desc "Create a WAM Service that, when bound to your app, will provide basic headers for dev and test lanes.  Consult an ASE if you require more WAM than that."
     group :lds, :services
     input :name, :desc => "Name for your service", :argument => :optional
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lds-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
@@ -102,6 +102,7 @@ files:
 - lib/lds-cf-plugin/http_service.rb
 - lib/lds-cf-plugin/custom_service.rb
 - lib/lds-cf-plugin/lds_account_service.rb
+- lib/lds-cf-plugin/enterprise_ws_service.rb
 - lib/lds-cf-plugin/marklogic_service.rb
 - lib/lds-cf-plugin/oracle_service.rb
 - lib/lds-cf-plugin/tunnel.rb