avst-wizard 0.0.42 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b39629fb104422ce4e8dbbe9e6bc9d318634dc5aa0ec01a0e179515fcb36459b
-  data.tar.gz: 4fa0d4b27a80c05cec06f925a12bfc1aaa0e294e8ae8dfd1e83bfe75c7a86916
+  metadata.gz: 7e1328d3f4f455e651d0154668604fa7c80ffbddcdba3bf425b248ddcadb04ee
+  data.tar.gz: 7d2e732e5f81822967c01e678225147c50e019d4cd04e37f2d1fa1de676b5a36
 SHA512:
-  metadata.gz: 770071ad9189337214b6389e95ec881ed5f1d5a899b168bf8991dc4fc54235e9ecece1c19acd8c7ce71c583ee806f2b4d2ef8ec0bfd0641052e7bf9bfddee6e1
-  data.tar.gz: 8fd8c2bb1c86f277cc839648283e3da08341dfd571d5f5ac43ca8758f6dfbfa75025cf0f52c024f5ceb5cd3000975e17e97c0b962fb936e183a2eab38758ef9a
+  metadata.gz: 96118b51714fd3dfe5d618b4ff0386bd6c1d8ccc366ffb616b74cb2b4e277a1930de2bd8b848a4a0adccf793d157393fdb39e2b43c9f6994078627b73cf4fafb
+  data.tar.gz: ad48cab5c02834674395429305d99445122766ea24b774ed479d2e002548f7da49c53ca36950470b0c858de4ea15053b5b4e7f53bf34f974db9f203b8696f094

data/avst-wizard.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "avst-wizard"
-  spec.version       = '0.0.42'
+  spec.version       = '0.0.43'
   spec.authors       = ["Martin Brehovsky"]
   spec.email         = ["mbrehovsky@adaptavist.com"]
   spec.summary       = %q{Avstwizard}

data/bin/avst-wizard

@@ -220,9 +220,17 @@ begin
             else
                 wait_for_next_state = nil
             end
+
+            # in case we know we have to wait for service to start properly  
+            if found['wait_before_post']
+                wait_before_post = found['wait_before_post'].to_i
+            else
+                wait_before_post = nil
+            end
+
             url = "#{base_url}/#{found['post_url']}"
-            puts "Posting to #{url} with params: #{found['values']} and with retry: #{wait_for_next_state}".green
-            runner.post_form(found['values'], url, wait_for_next_state )
+            puts "Posting to #{url} with params: #{found['values']} and with retry: wait_before_post: #{wait_before_post} wait_for_next_state: #{wait_for_next_state}".green
+            runner.post_form(found['values'], url, wait_for_next_state, wait_before_post )
         # in case no further url defined or stage marked as final, we are done 
         elsif stage_config["post_url"] == nil || stage_config["post_url"] == "" || stage_config["final"] == true 
             done = true
@@ -234,11 +242,17 @@ begin
             else
                 wait_for_next_state = nil
             end
+            
+            if stage_config['wait_before_post']
+                wait_for_next_state = stage_config['wait_before_post'].to_i
+            else
+                wait_before_post = nil
+            end
             # handles simple stages, that requires POST on the form and will wait for redirect
             url = "#{base_url}/#{stage_config['post_url']}"
             if !called
                 puts "Posting to #{url} with params: #{stage_config['values']}".green
-                runner.post_form(stage_config['values'], url, wait_for_next_state)
+                runner.post_form(stage_config['values'], url, wait_for_next_state, wait_before_post)
                 called=true
             end
         end

data/config/hiera/bitbucket/default.yaml

@@ -20,6 +20,7 @@ stages:
         substages:
             'id="database"':
                 wait_for_next_state: 15
+                wait_before_post: 30
                 parse_atl_token: true
                 post_url: 'setup'
                 values:

data/lib/avst-wizard.rb

@@ -218,7 +218,13 @@ module AvstWizard
 
         # form params to submit form to next checkpoint, will follow redirects after POST
         # wait_for_next_state - specifies number of retries, while waiting for next stage after post
-        def post_form(params, url, wait_for_next_state=nil)
+        def post_form(params, url, wait_for_next_state=nil, wait_before_post=nil)
+            if wait_before_post != nil and wait_before_post.is_a? Integer
+                0.upto wait_before_post do |value|
+                    sleep(1)
+                    print "."
+                end
+            end
             validate_params(params, url)
             uri = URI.parse(url)
             req = Net::HTTP::Post.new(uri.request_uri)
@@ -252,6 +258,7 @@ module AvstWizard
                 # future REST requests might use different response codes
                 # For example a 201 might be returned where there is no content, but still a success
                 # In case 200 is here there may be an error in the form, maybe add some checking
+                puts "Returned response code: #{response.code}, #{response.code.to_i != 302 and response.code.to_i != 200}"
                 if response.code.to_i != 302 and response.code.to_i != 200
                     puts response.inspect.red
                     puts response.body.inspect.red

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avst-wizard
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors:
 - Martin Brehovsky