brpm_content_framework 0.2.63 → 0.2.64

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWZkYjk5Y2EzMzAxNTJhMmZhMzAxN2MzNTI3ZDQ0Y2M1NDcyMTUwNg==
+    NmRiNWUyNGVkNzQwZmQ3MjYwYjI0ZTkxMTg5NWY4M2U4MDgyNzg0ZA==
   data.tar.gz: !binary |-
-    N2U5MGMwYzAwOTcxZTM4NjcwMGUzM2M2MzEzMGIyOGZiZDQ3MThmZg==
+    MGQxM2EzZWZhOWI5OWU1YzA2OGMzOGQ1Y2FhMzFkOTY0ZmY5YTAwYQ==
 SHA512:
   metadata.gz: !binary |-
-    MTM5Yzc5ZGNjZTJjYjJiNmI0ODhlZGVmYTE5ZWExYWMzNGNkYTU2MWIwOTAy
-    ODdhYTM4NjNhYzIwNTQ0ODkwNzYwNDljYjMwOTkyOTEwMWZhMDUxYjE3Mzkz
-    MTdkYTg2NzY4MjNhOTI3ZWM4YzNhNmNmNjhkZWZlM2NjMjIxYTQ=
+    ZmQ4NTc3ZDg3OGI2YTFiMTQwMjMyMmZjOGZhYTNiMjNjNTBiYzNmN2E4YTM5
+    Njg0N2RkMGNiMzM5NTNkZDRkMmQ2ODllODkyOTlhODdhNzE5ZDJjZTI1Yjg4
+    YTMxNjkzYWYxNWJmM2JmNmIyMWNiOTQ4N2NhOWJjODA3ZDhmMWE=
   data.tar.gz: !binary |-
-    ODk3MTFjMThmMTdiOTYyZDQyZTUyNjg1M2QwYjNiYjdjZmRjZjkxNjhkOWM1
-    NzBlNjUxMTFmMGMyZDRiNWI4ODk5ZGIyMDk1NmM1N2EwNjE3ZDQ4ZThiZGFh
-    MmJkZjk2MTMzYmNjNTJlOGM3ZDNkODY2Y2MxOWNjY2U1NjgyYWI=
+    OWNiYWRkZGM3MjExMGQxOTJkYzA3ZmJlZGFmZjdiNWI1YWVkNzFmYTI0ZDhl
+    NjhlOGMxY2NhN2MyMTdmYWE1OWY1NTEyYmQyZGRlZTkzMGM2YWIwMTljZmQ0
+    NzE1N2VhNDUzZWUyNTYzZWFkM2FhZGYyMzVlOWE5MDNhYTAwMTA=

data/README.md

@@ -368,5 +368,6 @@ For an example of how to update the status of the associated JIRA tickets after
 ### [JIRA](https://github.com/BMC-RLM/brpm_module_jira)
 ### [Jenkins](https://github.com/BMC-RLM/brpm_module_jenkins)
 ### [Ansible](https://github.com/BMC-RLM/brpm_module_ansible)
+### [ServiceNow](https://github.com/BMC-RLM/brpm_module_servicenow)
 ### [Demo customer](https://github.com/BMC-RLM/brpm_module_demo)
 

data/config.yml

@@ -1,4 +1,4 @@
-version: 0.2.63
+version: 0.2.64
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com
 homepage: https://github.com/BMC-RLM/brpm_content_framework

data/infrastructure/scripts/patch_brpm.sh

@@ -52,7 +52,6 @@ unzip -d $BRPM_HOME/releases/$NEW_VERSION/RPM $BRPM_HOME/releases/$NEW_VERSION/R
 echo "Copying over the config files from $BRPM_HOME/releases/$OLD_VERSION/RPM/config ..."
 /bin/cp $BRPM_HOME/releases/$OLD_VERSION/RPM/config/database.yml $BRPM_HOME/releases/$NEW_VERSION/RPM/config
 /bin/cp $BRPM_HOME/releases/$OLD_VERSION/RPM/config/automation_settings.rb $BRPM_HOME/releases/$NEW_VERSION/RPM/config
-/bin/cp $BRPM_HOME/releases/$OLD_VERSION/RPM/config/smtp_settings.rb $BRPM_HOME/releases/$NEW_VERSION/RPM/config
 /bin/cp $BRPM_HOME/releases/$OLD_VERSION/RPM/config/wicked_pdf_config.rb $BRPM_HOME/releases/$NEW_VERSION/RPM/config
 /bin/cp $BRPM_HOME/releases/$OLD_VERSION/RPM/config/carrierwave_settings.rb $BRPM_HOME/releases/$NEW_VERSION/RPM/config
 

data/infrastructure/scripts/run_webhook_receiver.sh

@@ -3,13 +3,11 @@
 export WEBHOOK_RECEIVER_PORT=8089
 export WEBHOOK_RECEIVER_MOUNT_POINT=webhooks
 export WEBHOOK_RECEIVER_LOG_FILE=/tmp/webhook_receiver.log
-export WEBHOOK_RECEIVER_INTEGRATION_ID=???
-export WEBHOOK_RECEIVER_PROCESS_EVENT_SCRIPT=integrations/jira/process_webhook_event.rb
+export WEBHOOK_RECEIVER_PROCESS_EVENT_SCRIPT=integrations/xxx/process_webhook_event.rb
 
 # custom settings
 export WEBHOOK_RECEIVER_BRPM_HOST=localhost
 export WEBHOOK_RECEIVER_BRPM_PORT=8088
 export WEBHOOK_RECEIVER_BRPM_TOKEN=???
-export WEBHOOK_RECEIVER_JIRA_RELEASE_FIELD_ID=???
 
 webhook_receiver

data/lib/brpm_script_executor.rb

@@ -118,11 +118,11 @@ EOR
         FileUtils.rm(params_path) if File.exists?(params_path)
 
         unless result["status"] == 0
-          BrpmAuto.log "stdout:#{result["stdout"]}"
+          BrpmAuto.log "stdout from the executed script:#{result["stdout"]}"
           raise "The process failed with status #{result["status"]}.\n#{result["stderr"]}"
         end
 
-        BrpmAuto.log "The process finished succesfully."
+        BrpmAuto.log "The process finished successfully."
 
         if automation_type == "resource_automation"
           result_path = params_path.sub!("params", "result")
@@ -162,6 +162,7 @@ EOR
       end
 
       result = execute_automation_script_internal(modul, name, params, automation_type, parent_id, offset, max_records)
+
       if automation_type == "resource_automation"
         result_file = params_file.sub("params", "result")
         BrpmAuto.log "  Temporarily storing the result to #{result_file}..."

data/lib/params/all_params.rb

@@ -17,6 +17,14 @@ class AllParams < ParamsBase
     raise RuntimeError.new("This is a virtual hash based on two physical hashes, use the add method instead.")
   end
 
+  def [](key)
+    if @params[key] and ! @params[key].empty?
+      @params[key]
+    else
+      @request_params[key]
+    end
+  end
+
   #TODO: refactor out the where functionality
   # Test if a param is present
   #

data/lib/params/request_params.rb

@@ -6,11 +6,14 @@ class RequestParams < ParamsBase
   def initialize(path)
     @file_path = "#{path}/request_data.json"
 
-    self.merge!(get_request_params)
+    if File.exist?(@file_path)
+      BrpmAuto.log "Loading the request params from #{@file_path}..."
+      self.merge!(get_request_params)
+    end
   end
 
   def self.new_for_request(automation_results_dir, app_name, request_id)
-    self.new("#{automation_results_dir}/request/#{app_name}/#{request_id}")
+    self.new("#{automation_results_dir}/request/#{app_name.gsub(" ", "_")}/#{request_id}")
   end
 
   def []=(key,val)

data/tests/all_params_spec.rb

@@ -18,8 +18,11 @@ describe 'All params' do
   end
 
   it 'should get a param from the request_param store' do
+    input_request_params = {}
+    input_request_params["key1"] = "value1"
+    set_request_params(input_request_params)
+
     input_params = get_default_params
-    input_params["key1"] = "value1"
 
     BrpmAuto.setup(input_params)
     all_params = BrpmAuto.all_params
@@ -28,6 +31,34 @@ describe 'All params' do
     expect(all_params["key1"]).to eql("value1")
   end
 
+  it 'should get a param from the param store if a param with the same name exists in the param and the request_param store' do
+    input_request_params = {}
+    input_request_params["key1"] = "value1"
+    set_request_params(input_request_params)
+
+    input_params = get_default_params
+    input_params["key1"] = "value2"
+
+    BrpmAuto.setup(input_params)
+    all_params = BrpmAuto.all_params
+
+    expect(all_params["key1"]).to eql("value2")
+  end
+
+  it 'should get a param from the request param store if a param with the same name exists in the param and the request_param store but the one from the param store is empty' do
+    input_request_params = {}
+    input_request_params["key1"] = "value1"
+    set_request_params(input_request_params)
+
+    input_params = get_default_params
+    input_params["key1"] = ""
+
+    BrpmAuto.setup(input_params)
+    all_params = BrpmAuto.all_params
+
+    expect(all_params["key1"]).to eql("value1")
+  end
+
   it 'should get a param by the get method' do
     input_params = get_default_params
     input_params["key1"] = "value1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.63
+  version: 0.2.64
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler