ruby_aem 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: affd400287f2582c3628d74c27a1660dc40b8fcf
-  data.tar.gz: 9e7aeccfb93cd83de25d8c479d8f63f8bec5f1d0
+  metadata.gz: e935c237f64320aeb8ddb56917048a6e417f9d9a
+  data.tar.gz: 7f91161aa63f00432bea5fc1b477ae2a0aef9fdb
 SHA512:
-  metadata.gz: 24cb1caeb841b1d0e29354ae6ceca45f7101d22dbf6afdec2f55c4545b6c87440b798ffd2fff69baea4f7122486ba3b865e06c43e3c115f59d3d1975cd43d9b7
-  data.tar.gz: 6c2e3cc1329ce0a65aff29b18a3c38fd02a9617f69e77d471ea9094cfcc21d319460b425c911c1e14b537bb3320ed086a1f43df6a98efa3c6a0a0e7abd3ea87d
+  metadata.gz: 106576e2b45a2364251f0dc22772ca086fa70c238ef5ebae9fcc3cc145ac08b638f83f63a54546b6cb2df7efcafc9ad16f9b648ec89fee43526e9e3c6694611c
+  data.tar.gz: 7ec45d83ea8e7513fa53f88080f6e1f22fd8e8b301eb04df10c85f8967033a6d7a1acb725069b7d8c7b697c2d257c5f5b5e341ee9bff7f18db53e8d5ca7839fb

data/conf/spec.yaml

@@ -9,6 +9,18 @@ aem:
         200:
           handler: simple
           message: 'Login page retrieved'
+    get_aem_health_check:
+      api: custom
+      operation: getAemHealthCheck
+      params:
+        required:
+        optional:
+          tags: '%{tags}'
+          combinetagsor: '%{combine_tags_or}'
+      responses:
+        200:
+          handler: json_aem_health_check
+          message: 'AEM health check retrieved'
 bundle:
   responses:
     404:
@@ -498,6 +510,22 @@ configproperty:
         201:
           handler: simple
           message: 'Set %{run_mode} %{config_node_name} config %{type} property %{name}=%{value}'
+    createaemhealthcheckservlet:
+      api: custom
+      operation: postConfigAemHealthCheckServlet
+      params:
+        required:
+          runmode: '%{run_mode}'
+        optional:
+          - bundles_ignored
+          - bundles_ignored_type_hint
+      responses:
+        200:
+          handler: simple
+          message: 'Set %{run_mode} %{config_node_name} config %{type} property %{name}=%{value}'
+        201:
+          handler: simple
+          message: 'Set %{run_mode} %{config_node_name} config %{type} property %{name}=%{value}'
 replicationagent:
   responses:
     404:

data/lib/ruby_aem/handlers/json.rb

@@ -48,7 +48,7 @@ module RubyAem
     #
     # @param response HTTP response containing status_code, body, and headers
     # @param response_spec response specification as configured in conf/spec.yaml
-    # @param call_params additional call_paramsrmation
+    # @param call_params additional call_params information
     # @return RubyAem::Result
     def Handlers.json_package_service(response, response_spec, call_params)
 
@@ -68,7 +68,7 @@ module RubyAem
     #
     # @param response HTTP response containing status_code, body, and headers
     # @param response_spec response specification as configured in conf/spec.yaml
-    # @param call_params additional call_paramsrmation
+    # @param call_params additional call_params information
     # @return RubyAem::Result
     def Handlers.json_package_filter(response, response_spec, call_params)
 
@@ -89,5 +89,23 @@ module RubyAem
 
     end
 
+    # Handle AEM Health Check Servlet JSON payload.
+    #
+    # @param response HTTP response containing status_code, body, and headers
+    # @param response_spec response specification as configured in conf/spec.yaml
+    # @param call_params additional call_params information
+    # @return RubyAem::Result
+    def Handlers.json_aem_health_check(response, response_spec, call_params)
+
+      json = JSON.parse(response.body)
+
+      message = response_spec['message'] % call_params
+
+      result = RubyAem::Result.new(message, response)
+      result.data = json['results']
+      result
+
+    end
+
   end
 end

data/lib/ruby_aem/resources/aem.rb

@@ -39,8 +39,23 @@ module RubyAem
         @client.call(self.class, __callee__.to_s, @call_params)
       end
 
+      # Retrieve AEM Health Check.
+      # This is a custom API and requires
+      # https://github.com/shinesolutions/aem-healthcheck
+      # to be installed.
+      #
+      # @param tags comma separated tags
+      # @param combine_tags_or
+      # @return RubyAem::Result
+      def get_aem_health_check(tags, combine_tags_or)
+
+        @call_params[:tags] = tags
+        @call_params[:combine_tags_or] = combine_tags_or
+
+        @client.call(self.class, __callee__.to_s, @call_params)
+      end
+
       # Retrieve AEM login page with retries until it is successful.
-      # This is handy for waiting for AEM to start or restart Jetty.
       #
       # @param opts optional parameters:
       # - _retries: retries library's options (http://www.rubydoc.info/gems/retries/0.0.5#Usage), restricted to max_trie, base_sleep_seconds, max_sleep_seconds
@@ -81,6 +96,54 @@ module RubyAem
         result
       end
 
+      # Retrieve AEM health check with retries until its status is OK.
+      #
+      # @param opts optional parameters:
+      # - _retries: retries library's options (http://www.rubydoc.info/gems/retries/0.0.5#Usage), restricted to max_trie, base_sleep_seconds, max_sleep_seconds
+      # @return RubyAem::Result
+      def get_aem_health_check_wait_until_ok(tags, combine_tags_or,
+        opts = {
+          _retries: {
+            max_tries: 30,
+            base_sleep_seconds: 2,
+            max_sleep_seconds: 2
+          }
+        })
+        opts[:_retries] ||= {}
+        opts[:_retries][:max_tries] ||= 30
+        opts[:_retries][:base_sleep_seconds] ||= 2
+        opts[:_retries][:max_sleep_seconds] ||= 2
+
+        # ensure integer retries setting (Puppet 3 passes numeric string)
+        opts[:_retries][:max_tries] = opts[:_retries][:max_tries].to_i
+        opts[:_retries][:base_sleep_seconds] = opts[:_retries][:base_sleep_seconds].to_i
+        opts[:_retries][:max_sleep_seconds] = opts[:_retries][:max_sleep_seconds].to_i
+
+        result = nil
+        with_retries(:max_tries => opts[:_retries][:max_tries], :base_sleep_seconds => opts[:_retries][:base_sleep_seconds], :max_sleep_seconds => opts[:_retries][:max_sleep_seconds]) { |retries_count|
+          begin
+            result = get_aem_health_check(tags, combine_tags_or)
+            is_ok = true;
+            result.data.each { |check|
+              if check['status'] != 'OK'
+                is_ok = false
+                break
+              end
+            }
+            if is_ok == false
+              puts 'Retrieve AEM Health Check attempt #%d: %s but not ok yet' % [retries_count, result.message]
+              raise StandardError.new(result.message)
+            else
+              puts 'Retrieve AEM Health Check attempt #%d: %s and ok' % [retries_count, result.message]
+            end
+          rescue RubyAem::Error => err
+            puts 'Retrieve AEM Health Check attempt #%d: %s' % [retries_count, err.message]
+            raise StandardError.new(err.message)
+          end
+        }
+        result
+      end
+
     end
   end
 end

data/lib/ruby_aem/swagger.rb

@@ -64,6 +64,8 @@ module RubyAem
         'Apache Sling DavEx Servlet'
       when 'com.shinesolutions.aem.passwordreset.Activator'
         'AEM Password Reset Activator'
+      when 'com.shinesolutions.healthcheck.hc.impl.ActiveBundleHealthCheck'
+        'AEM Health Check Servlet'
       else
         nil
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Shine Solutions
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: 0.9.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement