azdeploy 1.0.40 → 1.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6f3afb51c4b46fe9ebe591615ae3891ff16eb93
-  data.tar.gz: e381b99cd5f18135c9792531bb5f62209b7323f9
+  metadata.gz: 4f0c065fd5f26454958eef794494470d24e28156
+  data.tar.gz: 465cec8284f6364ec8748973f2a3eeab41aefa02
 SHA512:
-  metadata.gz: c24c77a38a31dc11be5c1c3c665dfaedfe660a08d11e222344ecbb94a4aa6438632801274be4074ff5b231230651223dbf031e81a4262ff904da579d99175ba7
-  data.tar.gz: 337e9d570559205ee30b08719caa4d2c7f6c93279b697b0b57065a8823fa30380cfe5290df0d44b451e8fdc213490c321dd81a5309a0238a4c8e11a2dd91881f
+  metadata.gz: d6cc59cd9f8f4d45ffcb06eac4e823d2a8c4fc35dd8f5233b96857ac5210aba66ea6351f9a2ede2a8e3b79e8dc4aa4d46dadaacd9b28c267bcbdcef3028d7172
+  data.tar.gz: ca1b1e542b56961a627feb715a5e0532514a4ba15ab3f2f03ae62e48abb9639bcb0dc0ed84959c30a25ed6ef7696fa55c0db8658dd1b77166fe1bb8cd2310612

data/azdeploy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'azdeploy'
-  s.version     = '1.0.40'
+  s.version     = '1.0.41'
   s.date        = '2016-01-14'
   s.summary     = 'Setup and scripting support for .Net project builds'
   s.description = 'Azure Deployment Gem. Provides easy setup and deployment scripting support for .Net project builds'

data/lib/transform.rb

@@ -13,6 +13,8 @@ class Transform
   VALUE = 'value'
   APPCLIENTID = 'AppClientId'
   APPIDURI = 'AppIdUri'
+  NEWRELIC_APPNAME = 'NewRelic.AppName'
+  SERVICENAME = 'ServiceName'
   OLDAPPID = 'AppId'
   EMPTY_STR = ''
   STORAGEACCOUNT = 'StorageAccount'
@@ -177,7 +179,7 @@ class Transform
       node = doc.at_css 'LocalResources'
       node.replace(get_value 'LocalResources') if !node.nil?
 
-      custom_xml_process.call(doc) if !custom_xml_process.nil?
+      custom_xml_process.call(doc) if !custom_xml_process.nil? and !doc.nil?
 
       File.write file, doc.to_xml
 
@@ -185,13 +187,19 @@ class Transform
   end
 
   def transform_riverbed doc
-    node = doc.at_css 'WebRole'
-    transform_riverbed_node(node) if !node.nil?
-    node = doc.at_css 'WorkerRole'
-    transform_riverbed_node(node) if !node.nil?
+    @service_name = ENV[SERVICENAME]
+    is_service = @service_name || NO_VALUE
+    if is_service != NO_VALUE
+      node = doc.at_css 'WebRole'
+      transform_riverbed_node(doc, node) if !node.nil?
+      node = doc.at_css 'WorkerRole'
+      transform_riverbed_node(doc, node) if !node.nil?
+    else
+      puts 'Not a service, avoiding transforming the csdef.'
+    end
   end
 
-  def transform_riverbed_node xml_node
+  def transform_riverbed_node doc, xml_node
     task_node = Nokogiri::XML::Node.new 'Task', doc
 
     task_node['commandLine'] = 'AppInternals\startup.cmd'
@@ -209,18 +217,24 @@ class Transform
   end
 
   def transform_newrelic doc
-    node = doc.at_css 'WebRole'
-    transform_newrelic_node(node) if !node.nil?
-    node = doc.at_css 'WorkerRole'
-    transform_newrelic_node(node) if !node.nil?
+    @service_name = ENV[SERVICENAME]
+    is_service = @service_name || NO_VALUE
+    if is_service != NO_VALUE
+      node = doc.at_css 'WebRole'
+      transform_newrelic_node(doc, node, @service_name) if !node.nil?
+      node = doc.at_css 'WorkerRole'
+      transform_newrelic_node(doc, node, @service_name) if !node.nil?
+    else
+      puts 'Not a service, avoiding transforming the csdef.'
+    end
   end
 
-  def transform_newrelic_node xml_node
+  def transform_newrelic_node doc, xml_node, service_name
     task_node = Nokogiri::XML::Node.new 'Task', doc
 
     task_node['commandLine'] = 'newrelic_env.cmd'
     task_node['executionContext'] = 'elevated'
-    task_node['taskType'] = 'foreground'
+    task_node['taskType'] = 'simple'
 
     existing_start_up_node = xml_node.at_css('Startup')
     if existing_start_up_node.nil?
@@ -233,13 +247,19 @@ class Transform
   end
 
   def transform_appdynamics doc
-    node = doc.at_css 'WebRole'
-    transform_appdynamics_node(node) if !node.nil?
-    node = doc.at_css 'WorkerRole'
-    transform_appdynamics_node(node) if !node.nil?
+    @service_name = ENV[SERVICENAME]
+    is_service = @service_name || NO_VALUE
+    if is_service != NO_VALUE
+      node = doc.at_css 'WebRole'
+      transform_appdynamics_node(doc, node) if !node.nil?
+      node = doc.at_css 'WorkerRole'
+      transform_appdynamics_node(doc, node) if !node.nil?
+    else
+      puts 'Not a service, avoiding transforming the csdef.'
+    end
   end
 
-  def transform_appdynamics_node xml_node
+  def transform_appdynamics_node doc, xml_node
     task_node = Nokogiri::XML::Node.new 'Task', doc
 
     task_node['commandLine'] = 'AppDynamics\startup.cmd'
@@ -462,7 +482,7 @@ class Transform
       transform_appsettings APPIDURI, appIdUri
     end
 
-    @service_name = ENV['ServiceName']
+    @service_name = ENV[SERVICENAME]
     is_service = @service_name || NO_VALUE
     if is_service != NO_VALUE
       puts "Transforming config for service: #{@service_name}"
@@ -483,6 +503,7 @@ class Transform
       use_newrelic = ENV['UseNewrelic'] || NO_VALUE
       if use_newrelic == "true"
         puts 'Using new relic...'
+        transform_appsettings NEWRELIC_APPNAME, @service_name
         xml_node_processing = method(:transform_newrelic)
       end
       use_appdynamics = ENV['UseAppdynamics'] || NO_VALUE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.40
+  version: 1.0.41
 platform: ruby
 authors:
 - Suresh Batta