avst-wizard 0.0.24 → 0.0.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWU2YzdhN2Y2NjE3MTlmZDI0NDJlZTVjZjk4YzQwNGJjNWQ2ZjFkOQ==
+    OTdjNGJlNjNiNTM5ODkzN2MyOWY1YTMzZWYzYTRmYjkyNDJkNGRjYw==
   data.tar.gz: !binary |-
-    ZmI4ZjA2ODcxMTNiYzk0NDg0NTM3YjNjNzEzYWZkZWVmOTg0NWZmNA==
+    MGVjMGY3NGMwZmQ2NTk1YzBlYWNjNTgzNGI3YTEwODAxM2FlZTcwZg==
 SHA512:
   metadata.gz: !binary |-
-    ZTdiN2YzM2RmZjBhNTRlOWZjYjk2ZjQxMjlkY2Q4NjNiMTE1ZjFhNzdjNWZl
-    MmJmMTM5ZDhlZWFjZTdiNzkyODk0ZjkwNTkxYmZhOTk4ZWMxMDM1NWQ0ODA1
-    YTQxNDVhMzFiNjBlY2QxMmQ5OTI1NjVjYWIxMTllOGMyYzIwN2Q=
+    YmRkNzllMmExZjBmYTVmMTcwMTQzYTExMTI0Yzg3MWUzYTlmNTRlYTdkNGVh
+    MTk5NmJkMWM0MjFjNGY3NGU0YzFiMDc4NzMzNzQxN2IyNWM1Zjg0ZWQ4YmUy
+    NmQ5MzRmMWJkNjc2OGJmZTFkOGFlMzlkMzVjNzQ3NGE4Nzg0MDk=
   data.tar.gz: !binary |-
-    NmY3ZmFjMDU1NDIxOTQ2ZDA2NzEwMThhMDhlN2Y1NjU1Njg1NGFjMmYyMjQz
-    ZGU5MmI2ZmFkMTcwNGQzNGIwZTI0NWU3MGQyOTEzNWE1Y2ExZDFhZTdiZjk1
-    ZWFjM2JhZjgzY2I5ZDYyNTMyMWEyOGI2MzhjN2I3ZDdkMTI2NzY=
+    ODJkNmQ1NmYwNjE3MWNmODZlMTkxZjU4MzI0Nzg0MGY0YjNjYzE0ZmZjOTg3
+    MWM4OWJkYmVkNjUwMjFhYzFlYTUzOWZiNjYyOGFkYTIwZDJmZjgyNzc4NDNi
+    YTM2ODQ4YTRiNzYzM2FjNDhhOTdlOTkzNDc1YzY2ZjFmMmM1OGE=

data/README.md

@@ -26,6 +26,7 @@ avst-wizard --hostname hostname --product_type product_type --base_url url --hie
 - hiera_config   - custom hiera.yaml file, defaults to hiera.yaml in project root
 - custom_config  - file with required params setup, defaults to config/config.yaml
 - ops            - Prints out required parameters to set for specified product
+-p, --use_tomcat_port PORT  - Use tomcat port to connect to the application
 
 ## Default usage and configuration
 

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.24'
+  spec.version       = '0.0.25'
   spec.authors       = ["Martin Brehovsky"]
   spec.email         = ["mbrehovsky@adaptavist.com"]
   spec.summary       = %q{Avstwizard}

data/bin/avst-wizard

@@ -37,6 +37,7 @@ Options:
   -b, --base_url BASE_URL                        Url where the product is accessible
   -c, --hiera_config CONFIG                      Hiera config file
   -f, --custom_config CUSTOM                     Contains key-values that will be available to hiera to configure stages [default: #{avst_wizard_base}/config/config.yaml]
+  -p, --use_tomcat_port PORT                     Use tomcat port to connect to the application
   -o, --ops                                      Shows params required to setup the atlassian app
   -v, --version VERSION                          Version of atlassian app, if not specified, default config is picked
 DOCOPT
@@ -52,6 +53,8 @@ end
 hostname     = options["--hostname"]
 product_type = options["--product_type"]
 base_url     = options["--base_url"]
+use_tomcat_port = options["--use_tomcat_port"]
+
 hiera_config = options["--hiera_config"]
 custom_config = options["--custom_config"]
 ops          = options["--ops"]
@@ -135,7 +138,15 @@ unless base_url
 end
 begin
     url_required_part = conf.get_config("url_required_part", false)
-    runner = AvstWizard::AvstWizard.new(base_url, required_config, url_required_part)
+    if use_tomcat_port 
+        host_url = base_url
+        base_url = "http://localhost:#{use_tomcat_port}"
+        puts "Using direct tomcat connection to #{base_url}"
+    else
+        host_url = nil
+        puts "Going via #{base_url}"
+    end
+    runner = AvstWizard::AvstWizard.new(base_url, required_config, url_required_part, host_url)
 
 
     # wait for app to start  
@@ -249,6 +260,7 @@ begin
 # In case something went wrong on the way
 rescue Exception => e
     message = e.message.force_encoding("utf-8")
+    puts e.backtrace.inspect
     abort(e.message.red)
 end
 

data/lib/avst-wizard.rb

@@ -24,63 +24,88 @@ module AvstWizard
 
         attr_writer :atl_token
 
-        def initialize(url, required_config = {}, url_required_part=nil)
+        def initialize(url, required_config = {}, url_required_part=nil, host_url)
             @url = url
             @cookie = ""
             @current_url = ""
             @atl_token = ""
             @required_config = required_config
             @url_required_part = url_required_part
+            @host_url = host_url
         end
 
         # Does GET requests to url, follows redirects, stores cookies and xsrf.token if present
-        def get_stage_and_fetch_cookie(url = @url , limit = 10)
+        def get_stage_and_fetch_cookie(request_url = @url , limit = 10)
             # You should choose better exception.
             raise ArgumentError, 'HTTP redirect too deep' if limit <= 0
-            puts "Trying to GET #{url}".yellow
-            url = URI.parse(url)        
+            puts "Trying to GET #{request_url}".yellow
+            url = URI.parse(request_url)
             req = Net::HTTP::Get.new(url.request_uri)
             if @cookie != ""
                 req['Cookie'] = get_cookie
             end
+            if @host_url 
+                req.add_field("Host", @host_url)
+            end
             use_ssl = false
             if url.instance_of? URI::HTTPS
                 use_ssl = true
             end
-            response = Net::HTTP.start(url.host, url.port, use_ssl: use_ssl, verify_mode: OpenSSL::SSL::VERIFY_NONE) { |http| http.request(req) }
-            if response['set-cookie']
-                @cookie = response['set-cookie'].split('; ')[0]
-                response['set-cookie'].split(';').each do |part|
-                    if ((part and part.include? "atl.xsrf.token") and (part.match(/atl.xsrf.token=(.*)/)))
-                        # parse only the token
-                        @atl_token = part.match(/atl.xsrf.token=(.*)/).captures[0]
-                        break
+            begin
+                response = Net::HTTP.start(url.host, url.port, use_ssl: use_ssl, verify_mode: OpenSSL::SSL::VERIFY_NONE) { |http| http.request(req) }
+                if response['set-cookie']
+                    @cookie = response['set-cookie'].split('; ')[0]
+                    response['set-cookie'].split(';').each do |part|
+                        if ((part and part.include? "atl.xsrf.token") and (part.match(/atl.xsrf.token=(.*)/)))
+                            # parse only the token
+                            @atl_token = part.match(/atl.xsrf.token=(.*)/).captures[0]
+                            break
+                        end
                     end
+                    puts "Found new cookie #{get_cookie}".yellow
                 end
-                puts "Found new cookie #{get_cookie}".yellow
-            end
-            if response['location']
-                redirection_url = compose_redirection_url(response['location'])
-                puts "Redirected to: #{redirection_url}".yellow
-            else
-                @current_url = url.request_uri
-                puts "Ended in: #{@current_url}".yellow
-            end
-            case response
-            when Net::HTTPSuccess     then response.code.to_i
-            when Net::HTTPRedirection then get_stage_and_fetch_cookie(redirection_url, limit - 1)
-            else
-                puts response.body
-                puts response.code.to_s
-                response.code.to_i
+                if response['location']
+                    redirection_url = compose_redirection_url(response['location'])
+                    puts "Redirected to: #{redirection_url}".yellow
+                else
+                    @current_url = url.request_uri
+                    puts "Ended in: #{@current_url}".yellow
+                end
+                case response
+                when Net::HTTPSuccess     then response.code.to_i
+                when Net::HTTPRedirection then get_stage_and_fetch_cookie(redirection_url, limit - 1)
+                else
+                    puts response.body
+                    puts response.code.to_s
+                    response.code.to_i
+                end
+            rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Errno::ECONNREFUSED,
+                    Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+                @current_url = request_url
+                404
             end
         end
 
         def compose_redirection_url(location)
+            
+            # in case we do tomcat and the redirection returns http*://host_url/path 
+            if @host_url and location.include? @host_url and location.start_with? "http"
+                begin
+                    uri = URI::parse(location)
+                    location = uri.path
+                rescue Exception => e
+                    puts "Can not parse URI from #{location}"
+                end
+            end
             # in case response['location'] is not full url we need to compose it
             # if it does contain base_url we assume it is ok
             if location.include? @url
-                location
+                location    
+            # in case redirection contains the startup string, the system has not started yet
+            elsif location.include? "startup.jsp?returnTo="
+                puts "System starting up staying on #{@url}"
+                sleep(10)
+                @url
             else
                 # in Jira 7.1.7 location is databaseSetup.jspa not secure/databaseSetup.jspa
                 if @url_required_part and !location.include? "/#{@url_required_part}/"
@@ -91,6 +116,7 @@ module AvstWizard
                     "#{@url}#{location}"
                 end
             end 
+            
         end
 
         # add atl_token to cookie in case it is present
@@ -122,6 +148,9 @@ module AvstWizard
             if url.instance_of? URI::HTTPS
                 use_ssl = true
             end
+            if @host_url 
+                req.add_field("Host", @host_url)
+            end
             response = Net::HTTP.start(url.host, url.port, use_ssl: use_ssl, verify_mode: OpenSSL::SSL::VERIFY_NONE) { |http| http.request(req) }
             # TODO: is it possible that this might be a redirect? Can Net::HTTP follow redirects automatically?
             if response.code.to_i != 200
@@ -177,6 +206,9 @@ module AvstWizard
             if uri.instance_of? URI::HTTPS
                 use_ssl = true
             end
+            if @host_url 
+                req.add_field("Host", @host_url)
+            end
             Net::HTTP.start(uri.hostname, uri.port, use_ssl: use_ssl, verify_mode: OpenSSL::SSL::VERIFY_NONE, :read_timeout => 1000) do |http|
                 response = http.request(req)
                 puts "Response: #{response.inspect}".yellow

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avst-wizard
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Martin Brehovsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler