azdeploy 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9bb7548db5cec9e11d4a65b1a6de69159b581a1
-  data.tar.gz: 2cb3abd91e3710a067a27f407fe00ad16601632e
+  metadata.gz: f44fe4d7f6c34024cc9807e921bc5e3474bc7404
+  data.tar.gz: fa1d0b6b5f31843d4ae7a9ce625f73e283a7a3ff
 SHA512:
-  metadata.gz: 6b1b760dba40834d8f1700b29fad30f194f232bfbf7806693db401cff10b66d69244c5c753ee656ac33feb9219ab9a007e776959303da9731b0f1e6de6675d66
-  data.tar.gz: 61dadaefeb6b0e12263129910ebff9415ccea7d5a8c8e2f1926c8fbe770568092a38b8f7bf4cb9d15e62d72a2c8222137778ce5096fc986c6ad3a02c77a1df4c
+  metadata.gz: 5740cfe22441487a334a8cfcf1b0c36cf91454f4d27f2aa3b9730a0194ea35014430471496bccdd92f339b0775a419368707da8129d1fc63fdb019d0e494954c
+  data.tar.gz: 54d83b7dbcf8a783584c134c7e936f5201fa4ebb8ccd9b841ce565554831c060f522523b90086042bc33118caa7f03480e5b19c83c71ac84d43bd56d6ca708df

data/azdeploy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'azdeploy'
-  s.version     = '1.0.19'
-  s.date        = '2015-08-05'
+  s.version     = '1.0.20'
+  s.date        = '2015-08-06'
   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'
   s.authors     = ['Suresh Batta']

data/lib/transform.rb

@@ -37,6 +37,9 @@ class Transform
     end
 
     def get_value(key)
+        if (@settings.nil?)
+            return
+        end
         value = ''
         @settings.each { |i|
             if i.properties[ROWKEY] == key
@@ -47,36 +50,38 @@ class Transform
 
         value
     end
-
-    def transform_connstring(connstr)    
-        @config_files.each{|file|
-            doc = Nokogiri::XML(File.read(file))
-            puts "Processing file: #{file}"
-            node = doc.at_css "appSettings/add[@key='connectionString']"
-            if !node.nil?
-                node[VALUE] = connstr
-                File.write(file, doc.to_xml)
-            end
-        }
-    end
     
-    def transform_appsettings
+    def transform_appsettings(key = '', value = '')
         # go to each file and replace value of matching appSettings key
         @config_files.each{|file|
             doc = Nokogiri::XML(File.read(file))
             puts "Processing file: #{file}"
-            @settings.each { |i|
-                key = i.properties[ROWKEY]
-                node = doc.at_css "appSettings/add[@key='#{key}']"
+            if (@settings.nil?)
+                if (key.to_s == '')
+                    k = NO
+                else
+                    k = key
+                end
+                if (value.to_s == '')
+                    v = NO
+                else
+                    v = value
+                end
+            else
+                @settings.each { |i|
+                    k = i.properties[ROWKEY] || NO
+                    v = i.properties[SETTING] || NO
+                }
+            end
+            if (k != NO && v != NO)
+                node = doc.at_css "appSettings/add[@key='#{k}']"
                 if !node.nil?
-                    oldVal = node[VALUE]
-                    #puts "Old value: #{oldVal}"
-                    node[VALUE] = i.properties[SETTING]
-                    newVal = node[VALUE]
-                    #puts "New value: #{newVal}"
+                    #puts "Old value: #{node[VALUE]}"
+                    node[VALUE] = v
+                    #puts "New value: #{v}"
                     File.write(file, doc.to_xml)
                 end
-            }            
+            end
         }
     end
 
@@ -175,7 +180,13 @@ class Transform
 
             node = doc.at_css 'InstrumentationKey'
             if (!node.nil?)
-                node.content = get_value('AI_InstrumentationKey') if !node.nil?
+                val_from_settings = get_value('AI_InstrumentationKey')
+                if (val_from_settings.to_s == '')
+                    aikey =  ENV['AI_InstrumentationKey'] || NO
+                end
+                if (aikey != NO)
+                    node.content = aikey
+                end
             end
             
             File.write(file, doc.to_xml)
@@ -212,12 +223,17 @@ class Transform
     end
     
     def transform
-    
-        # find all App.config and web.config files
-        @config_files = Dir.glob('**/app.config')
-        @config_files.concat(Dir.glob('**/appSettings.config'))
-        @config_files.concat(Dir.glob('**/web.config'))
-        
+
+        # --- Get environment invoked
+        @env = ENV['env'] || NO
+        if @env == NO
+            puts 'Environment name required to transform. No configuration changes will be done...'
+            return false
+        else
+            puts "Transforming config for environment: #{@env} ..."
+        end
+
+        # --- Get Settings Account Name, Key and Table from Environment variables
         settings_account_name = ENV['SettingsAccount'] || ENV['StorageAccount'] || NO
         if (settings_account_name == NO)
             puts "No settings storage account name found"
@@ -233,28 +249,14 @@ class Transform
             puts "No configuration table found"
             return false
         end
-        
-        puts 'updating settings connection string...'
-        settings_connstr = "DefaultEndpointsProtocol=https;AccountName=#{settings_account_name};AccountKey=#{settings_access_key}"
-        should_update_settings_connstr = ENV['should_update_settings_connstr'] || NO
-        if should_update_settings_connstr == NO
-            puts 'Flag for Setttings Connection String Update not set.'
-        else
-            transform_connstring(settings_connstr)
-        end
-        
-        # environment invoked
-        @env = ENV['env'] || NO
-        if @env == NO
-            puts 'Environment name required to transform. No configuration changes will be done...'
-            return false
-        end
-    
-        is_service = ENV['ServiceName'] || NO
-        puts 'Target to transform is not a service...' if is_service == NO
 
-        puts "Transforming config for environment: #{@env} ..."
+        # --- Collect config files to transform
+        # find all App.config and web.config files
+        @config_files = Dir.glob('**/app.config')
+        @config_files.concat(Dir.glob('**/appSettings.config'))
+        @config_files.concat(Dir.glob('**/web.config'))
 
+        # --- Load Settings from storage
         # azure table storage account where settings reside
         Azure.config.storage_account_name = settings_account_name
         Azure.config.storage_access_key = settings_access_key
@@ -266,8 +268,31 @@ class Transform
         # get all settings for environment
         @settings = get_all
 
-        if is_service
+        # --- Start Transformations ---
+        puts 'updating settings connection string...'
+        settings_connstr = "DefaultEndpointsProtocol=https;AccountName=#{settings_account_name};AccountKey=#{settings_access_key}"
+        should_update_settings_connstr = ENV['should_update_settings_connstr'] || NO
+        if should_update_settings_connstr == NO
+            puts 'Flag for Setttings Connection String Update not set.'
+        else
+            puts settings_connstr
+            transform_appsettings('connectionString', settings_connstr)
+        end
+
+        puts 'updating unit test connection string...'
+        unitest_connstr = "DefaultEndpointsProtocol=https;AccountName=#{settings_account_name};AccountKey=#{settings_access_key}"
+        unitest_connstr = ENV['unitestconnectionString'] || NO
+        if unitest_connstr == NO
+            puts 'No unit test connection string found.'
+        else
+            transform_appsettings('unitestconnectionString', unitest_connstr)
+        end
+    
+        is_service = ENV['ServiceName'] || NO
 
+        if is_service != NO
+            puts "Transforming config for service: #{ENV['ServiceName']}" 
+            
             puts 'Obtaining cloud configuration templates...'
             csdefTemplate = get_value('ServiceDefinitionTemplate')
             File.write('ServiceDefinition.csdef', csdefTemplate)
@@ -288,7 +313,8 @@ class Transform
 
             puts 'Replacing service model settings...'
             transform_servicemodelconfig
-            
+        else
+            puts 'Target to transform is not a service...'
         end
         
         puts 'Replacing app settings...'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Suresh Batta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies: []
 description: Azure Deployment Gem. Provides easy setup and deployment scripting support
   for .Net project builds