knife-azure 1.0.2 → 1.1.0

data/lib/chef/knife/azure_server_delete.rb

@@ -32,18 +32,40 @@ class Chef
 
       banner "knife azure server delete SERVER [SERVER] (options)"
 
+      option :preserve_azure_os_disk,
+        :long => "--preserve-azure-os-disk",
+        :boolean => true,
+        :default => false,
+        :description => "Preserve corresponding OS Disk"
+
       option :purge,
         :short => "-P",
         :long => "--purge",
         :boolean => true,
         :default => false,
-        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the EC2 node itself.  Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
+        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the Windows Azure node itself.  Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
 
       option :chef_node_name,
         :short => "-N NAME",
         :long => "--node-name NAME",
         :description => "The name of the node and client to delete, if it differs from the server name.  Only has meaning when used with the '--purge' option."
 
+      option :preserve_azure_dns_name,
+        :long => "--preserve-azure-dns-name",
+        :boolean => true,
+        :default => false,
+        :description => "Preserve corresponding cloud service (DNS). If the option is not set, it deletes the service not used by any VMs."
+
+      option :delete_azure_storage_account,
+        :long => "--delete-azure-storage-account",
+        :boolean => true,
+        :default => false,
+        :description => "Delete corresponding storage account. If the option is set, it deletes the storage account not used by any VMs."
+
+      option :azure_dns_name,
+        :long => "--azure-dns-name NAME",
+        :description => "specifies the DNS name (also known as hosted service name)"
+
       # Extracted from Chef::Knife.delete_object, because it has a
       # confirmation step built in... By specifying the '--purge'
       # flag (and also explicitly confirming the server destruction!)
@@ -59,27 +81,46 @@ class Chef
         end
       end
 
+      def validate_disk_and_storage
+         if locate_config_value(:preserve_azure_os_disk) && locate_config_value(:delete_azure_storage_account)
+            ui.warn("Cannot delete storage account while keeping OS Disk. Please set any one option.")
+            exit
+          else
+            true
+          end
+      end
+
       def run
 
         validate!
-
+        validate_disk_and_storage
         @name_args.each do |name|
 
           begin
-            server = connection.roles.find(name)
+            server = connection.roles.find(name, params = { :azure_dns_name => locate_config_value(:azure_dns_name) })
 
+            if not server
+              ui.warn("Server #{name} does not exist")
+              return
+            end
             puts "\n"
-            msg_pair('Service', server.hostedservicename)
-            msg_pair('Deployment', server.deployname)
-            msg_pair('Role', server.name)
+            msg_pair('DNS Name', server.hostedservicename + ".cloudapp.net")
+            msg_pair('VM Name', server.name)
             msg_pair('Size', server.size)
-            msg_pair('SSH Ip Address', server.sshipaddress)
-            msg_pair('SSH Port', server.sshport)
-
+            msg_pair('Public Ip Address', server.publicipaddress)
             puts "\n"
-            confirm("Do you really want to delete this server")
 
-            connection.roles.delete(name)
+            begin
+              confirm("Do you really want to delete this server")
+            rescue SystemExit   # Need to handle this as confirming with N/n raises SystemExit exception
+              server = nil      # Cleanup is implicitly performed in other cloud plugins
+              exit!
+            end
+
+            connection.roles.delete(name, params = { :preserve_azure_os_disk => locate_config_value(:preserve_azure_os_disk),
+                                                     :preserve_azure_dns_name => locate_config_value(:preserve_azure_dns_name),
+                                                     :azure_dns_name => server.hostedservicename,
+                                                     :delete_azure_storage_account => locate_config_value(:delete_azure_storage_account) })
 
             puts "\n"
             ui.warn("Deleted server #{server.name}")
@@ -92,8 +133,9 @@ class Chef
               ui.warn("Corresponding node and client for the #{name} server were not deleted and remain registered with the Chef Server")
             end
 
-          rescue NoMethodError
-            ui.error("Could not locate server '#{name}'.  Please verify it was provisioned.")
+          rescue Exception => ex
+            ui.error("#{ex.message}")
+            ui.error("#{ex.backtrace.join("\n")}")
           end
         end
       end

data/lib/chef/knife/azure_server_list.rb

@@ -33,17 +33,13 @@ class Chef
 
         validate!
 
-        server_list = [
-          ui.color('Status', :bold),
-          ui.color('Service', :bold),
-          ui.color('Deployment', :bold),
-          ui.color('Role', :bold),
-          ui.color('Host', :bold),
-          ui.color('SSH IP', :bold),
-          ui.color('SSH Port', :bold)
-        ]
+        server_labels = ['DNS Name', 'VM Name', 'Status', 'IP Address', 'SSH Port', 'WinRM Port' ]
+        server_list =  server_labels.map {|label| ui.color(label, :bold)}
         items = connection.roles.all
+
         items.each do |server|
+          server_list << server.hostedservicename.to_s+".cloudapp.net"  # Info about the DNS name at http://msdn.microsoft.com/en-us/library/ee460806.aspx
+          server_list << server.name.to_s
           server_list << begin
                            state = server.status.to_s.downcase
                            case state
@@ -54,16 +50,13 @@ class Chef
                            else
                              ui.color('ready', :green)
                            end
-          end
-          server_list << server.hostedservicename.to_s
-          server_list << server.deployname.to_s
-          server_list << server.name.to_s
-          server_list << server.hostname.to_s
-          server_list << server.sshipaddress.to_s
+                         end
+          server_list << server.publicipaddress.to_s
           server_list << server.sshport.to_s
+          server_list << server.winrmport.to_s
         end
         puts ''
-        puts ui.list(server_list, :columns_across, 7)
+        puts ui.list(server_list, :uneven_columns_across, 6)
       end
     end
   end

data/lib/knife-azure/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Azure
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,270 +1,182 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-azure
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Barry Davis
 - Chirag Jog
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-06-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
-        version: 0.9.2.2
-  prerelease: false
-  name: rake
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.10.0
-  prerelease: false
-  name: chef
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
-  prerelease: false
-  name: rspec
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 3
-        - 12
-        version: "3.12"
   prerelease: false
-  name: rdoc
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  name: guard-rspec
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubygems-bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.0.3
-  prerelease: false
-  name: rubygems-bundler
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 2
-        - 9
-        version: 0.2.9
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
   name: equivalent-xml
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 0
-        - 3
-        version: 2.0.3
-  prerelease: false
-  name: net-ssh
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.9
   type: :runtime
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
-        version: 1.0.1
   prerelease: false
-  name: net-ssh-multi
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 0
-        - 4
-        version: 1.0.4
-  prerelease: false
-  name: net-scp
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 0.2.9
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
   type: :runtime
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 5
-        - 5
+      - !ruby/object:Gem::Version
         version: 1.5.5
+- !ruby/object:Gem::Dependency
+  name: knife-windows
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  name: nokogiri
-  version_requirements: *id012
-description: A plugin to Opscode knife for creating instances on the Microsoft Azure platform
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A plugin to Opscode knife for creating instances on the Microsoft Azure
+  platform
 email: oss@opscode.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-files: 
+files:
 - LICENSE
-- README.rdoc
-- lib/azure/image.rb
-- lib/azure/rest.rb
+- README.md
+- lib/azure/certificate.rb
 - lib/azure/connection.rb
-- lib/azure/host.rb
+- lib/azure/deploy.rb
 - lib/azure/disk.rb
+- lib/azure/host.rb
+- lib/azure/image.rb
+- lib/azure/rest.rb
+- lib/azure/role.rb
 - lib/azure/storageaccount.rb
-- lib/azure/deploy.rb
 - lib/azure/utility.rb
-- lib/azure/role.rb
-- lib/knife-azure/version.rb
+- lib/chef/knife/azure_base.rb
+- lib/chef/knife/azure_image_list.rb
+- lib/chef/knife/azure_server_create.rb
 - lib/chef/knife/azure_server_delete.rb
 - lib/chef/knife/azure_server_describe.rb
-- lib/chef/knife/azure_server_create.rb
-- lib/chef/knife/azure_image_list.rb
-- lib/chef/knife/azure_base.rb
 - lib/chef/knife/azure_server_list.rb
+- lib/knife-azure/version.rb
 homepage: http://github.com/opscode/knife-azure
-licenses: 
+licenses:
 - Apache 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1796452093353551552
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A plugin to Opscode knife for creating instances on the Microsoft Azure platform
 test_files: []
-