ruby_aem 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf4fa41608ff393bae26090c24cd398993c82ac2
-  data.tar.gz: b7f3eed536af4ae8fde43eeebf15e426c6d0ec85
+  metadata.gz: 46d97b74d2f3cfd1c5702001a169427c5be4865a
+  data.tar.gz: 75ae679a7fc78f70e39bf31734575f1c05e1badd
 SHA512:
-  metadata.gz: 61c9d87f0ef993e772eccf87707b213f446e11e8bf1256ad94654f804b947c2094d432d988834523c8b530b170191a65ac67b1bb7133525db92c52eb7b10d2b5
-  data.tar.gz: 43c1707b025aa3b8a67404051f851777f28aa209206b1eb1f8c28aab8b7ac6d2b14251a96477bea7e0597e72f13a428303795ebc9f017d4ffea28f7909d3490e
+  metadata.gz: ec8453f2b50fc61619725a79ed8faddb3412181d96e248422cbb39434ed8a84b84f3f1cfaea43ffb0615509004f1ae993e982b689cc717b60339cc9380f633ea
+  data.tar.gz: c4abdc405b9b96cc34f99c5355f577df0d272560624854294b2ac0b2bb3e28250b9b88f72bad9a9310a77f19e4568f2b86ed36297921d875e25c09f816e125bb

data/conf/gem.yaml

@@ -1 +1 @@
-version: 3.2.1
+version: 3.3.0

data/conf/spec.yaml

@@ -228,6 +228,17 @@ bundle:
         200:
           handler: simple
           message: 'Bundle %{name} stopped'
+aemconfigmgr:
+  actions:
+    get:
+      api: console
+      operation: getConfigMgr
+      params:
+        required:
+      responses:
+        200:
+          handler: simple
+          message: 'Configuration Manager page successfully received'
 certificate:
   actions:
     import:
@@ -1156,8 +1167,8 @@ repository:
 saml:
   actions:
     get:
-      api: console
-      operation: postSamlConfiguration
+      api: configmgr
+      operation: comAdobeGraniteAuthSamlSamlAuthenticationHandler
       params:
         optional:
           post: true
@@ -1166,8 +1177,8 @@ saml:
           handler: simple
           message: 'SAML Configuration found'
     create:
-      api: console
-      operation: postSamlConfiguration
+      api: configmgr
+      operation: comAdobeGraniteAuthSamlSamlAuthenticationHandler
       params:
         optional:
           - post
@@ -1208,8 +1219,8 @@ saml:
           handler: simple
           message: 'SAML Configuration created'
     delete:
-      api: console
-      operation: postSamlConfiguration
+      api: configmgr
+      operation: comAdobeGraniteAuthSamlSamlAuthenticationHandler
       params:
         optional:
           - apply

data/lib/ruby_aem.rb

@@ -14,6 +14,7 @@
 
 require 'ruby_aem/client'
 require 'ruby_aem/resources/aem'
+require 'ruby_aem/resources/aem_configmgr'
 require 'ruby_aem/resources/authorizable_keystore'
 require 'ruby_aem/resources/bundle'
 require 'ruby_aem/resources/certificate'
@@ -32,6 +33,7 @@ require 'ruby_aem/resources/repository'
 require 'ruby_aem/resources/truststore'
 require 'ruby_aem/resources/user'
 require 'swagger_aem'
+require 'swagger_aem_osgi'
 require 'yaml'
 
 module RubyAem
@@ -65,8 +67,23 @@ module RubyAem
         ]
       }
 
+      SwaggerAemOsgiClient.configure { |swagger_conf|
+        [
+          swagger_conf.scheme = conf[:protocol],
+          swagger_conf.host = "#{conf[:host]}:#{conf[:port]}",
+          swagger_conf.username = conf[:username],
+          swagger_conf.password = conf[:password],
+          swagger_conf.timeout = conf[:timeout],
+          swagger_conf.debugging = conf[:debug],
+          swagger_conf.verify_ssl = conf[:verify_ssl],
+          swagger_conf.verify_ssl_host = conf[:verify_ssl],
+          swagger_conf.params_encoding = :multi
+        ]
+      }
+
       apis = {
         console: SwaggerAemClient::ConsoleApi.new,
+        configmgr: SwaggerAemOsgiClient::ConfigmgrApi.new,
         custom: SwaggerAemClient::CustomApi.new,
         cq: SwaggerAemClient::CqApi.new,
         crx: SwaggerAemClient::CrxApi.new,
@@ -101,6 +118,13 @@ module RubyAem
       RubyAem::Resources::Aem.new(@client)
     end
 
+    # Create an AEM ConfigMgr instance.
+    #
+    # @return new RubyAem::Resources::Aem instance
+    def aem_configmgr
+      RubyAem::Resources::AemConfigMgr.new(@client)
+    end
+
     # Create a bundle instance.
     #
     # @param name the bundle's name, e.g. com.adobe.cq.social.cq-social-forum

data/lib/ruby_aem/client.rb

@@ -75,6 +75,8 @@ module RubyAem
         response = RubyAem::Response.new(status_code, data, headers)
       rescue SwaggerAemClient::ApiError => e
         response = RubyAem::Response.new(e.code, e.response_body, e.response_headers)
+      rescue SwaggerAemOsgiClient::ApiError => e
+        response = RubyAem::Response.new(e.code, e.response_body, e.response_headers)
       end
       handle(response, responses_spec, call_params)
     end

data/lib/ruby_aem/resources/aem_configmgr.rb

@@ -0,0 +1,42 @@
+# Copyright 2016-2019 Shine Solutions
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'typhoeus'
+require 'yaml'
+
+module RubyAem
+  #  AEM resources
+  module Resources
+    # AEM class contains API calls related to managing the AEM instance itself.
+    class AemConfigMgr
+      # Initialise an AEM instance.
+      #
+      # @param client RubyAem::Client
+      # @return new RubyAem::Resources::Aem instance
+      def initialize(client)
+        @client = client
+        @call_params = {
+        }
+      end
+
+      # Connect to AEM /system/console/configMgr to collect
+      # all configuration nodes
+      #
+      # @return RubyAem::Result
+      def get
+        @client.call(self.class, __callee__.to_s, @call_params)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Shine Solutions
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retries
@@ -87,6 +87,7 @@ files:
 - lib/ruby_aem/handlers/simple.rb
 - lib/ruby_aem/handlers/xml.rb
 - lib/ruby_aem/resources/aem.rb
+- lib/ruby_aem/resources/aem_configmgr.rb
 - lib/ruby_aem/resources/authorizable_keystore.rb
 - lib/ruby_aem/resources/bundle.rb
 - lib/ruby_aem/resources/certificate.rb