kinetic_sdk 0.1.1 → 1.0.0

data/lib/kinetic_sdk/task/lib/config.rb

@@ -7,7 +7,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_db(params={}, headers=header_basic_auth)
-      info("Finding the database configuration")
+      @logger.info("Finding the database configuration")
       get("#{@api_url}/config/db", params, headers)
     end
 
@@ -18,7 +18,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_session_configuration(params={}, headers=header_basic_auth)
-      info("Finding the session timeout")
+      @logger.info("Finding the session timeout")
       get("#{@api_url}/config/session", params, headers)
     end
 
@@ -35,14 +35,14 @@ module KineticSdk
     #       "authenticator" => "com.kineticdata.core.v1.authenticators.ProxyAuthenticator",
     #       "authenticationJsp" => "/WEB-INF/app/login.jsp",
     #       "properties" => {
-    #         "Authenticator[Authentication Strategy]" => "Http Header",
-    #         "Authenticator[Header Name]" => "X-Login",
-    #         "Authenticator[Guest Access Enabled]" => "No"
+    #         "Authentication Strategy" => "Http Header",
+    #         "Header Name" => "X-Login",
+    #         "Guest Access Enabled" => "No"
     #       }
     #     })
     #
     def update_authentication(settings, headers=default_headers)
-      info("Updating the authentication properties")
+      @logger.info("Updating the authentication properties")
       put("#{@api_url}/config/auth", settings, headers)
     end
 
@@ -66,7 +66,7 @@ module KineticSdk
     #     })
     #
     def update_db(settings, headers=default_headers)
-      info("Updating the database properties")
+      @logger.info("Updating the database properties")
       put("#{@api_url}/config/db", settings, headers)
     end
 
@@ -86,12 +86,12 @@ module KineticSdk
     #     })
     #
     def update_engine(settings, headers=default_headers)
-      info("Updating the engine properties")
+      @logger.info("Updating the engine properties")
       put("#{@api_url}/config/engine", settings, headers)
 
       # start the task engine?
       if !settings['Sleep Delay'].nil? && settings['Sleep Delay'].to_i > 0
-        info("Starting the engine")
+        @logger.info("Starting the engine")
         start_engine
       end
     end
@@ -116,7 +116,7 @@ module KineticSdk
     #     })
     #
     def update_identity_store(settings, headers=default_headers)
-      info("Updating the identity store properties")
+      @logger.info("Updating the identity store properties")
       put("#{@api_url}/config/identityStore", settings, headers)
     end
 
@@ -144,7 +144,7 @@ module KineticSdk
     #     })
     #
     def update_properties(settings, headers=default_headers)
-      info("Updating the web server properties")
+      @logger.info("Updating the web server properties")
       put("#{@api_url}/config/server", settings, headers)
 
       # reset the configuration user
@@ -168,7 +168,7 @@ module KineticSdk
     #     })
     #
     def update_session_configuration(settings, headers=default_headers)
-      info("Updating the session configuration settings")
+      @logger.info("Updating the session configuration settings")
       put("#{@api_url}/config/session", settings, headers)
     end
 
@@ -178,7 +178,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_system_policy_rule(params={}, headers=header_basic_auth)
-      info("Finding the system policy rule")
+      @logger.info("Finding the system policy rule")
       get("#{@api_url}/config/systemPolicyRule", params, headers)
     end
 
@@ -193,7 +193,7 @@ module KineticSdk
     #     update_system_policy_rule("Allow All")
     #
     def update_system_policy_rule(policy_rule_name, headers=default_headers)
-      info("Updating the system policy rule")
+      @logger.info("Updating the system policy rule")
       payload = { "name" => policy_rule_name }
       put("#{@api_url}/config/systemPolicyRule", payload, headers)
     end

data/lib/kinetic_sdk/task/lib/engine.rb

@@ -33,7 +33,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def engine_status(headers=header_basic_auth)
-      response = engine_info({}, headers)
+      response = engine_@logger.info({}, headers)
       data = response.content
       data.nil? ? "Unknown" : data['status']
     end

data/lib/kinetic_sdk/task/lib/errors.rb

@@ -8,7 +8,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     # @since Task v4.3.0
     def delete_error(id, headers=header_basic_auth)
-      info("Deleting Error \"#{id}\"")
+      @logger.info("Deleting Error \"#{id}\"")
       delete("#{@api_url}/errors/#{id}", headers)
     end
 
@@ -26,7 +26,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def resolve_errors(ids, action, resolution, headers=default_headers)
-      info("Resolving errors #{ids}")
+      @logger.info("Resolving errors #{ids}")
       body = { "ids" => ids, "action" => action, "resolution" => resolution }
       post("#{@api_url}/errors/resolve", body, headers)
     end
@@ -57,7 +57,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_errors(params={}, headers=header_basic_auth)
-      info("Finding errors")
+      @logger.info("Finding errors")
       get("#{@api_url}/errors", params, headers)
     end
 
@@ -68,7 +68,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_error(id, params={}, headers=header_basic_auth)
-      info("Finding error #{id}")
+      @logger.info("Finding error #{id}")
       get("#{@api_url}/errors/#{id}", params, headers)
     end
 
@@ -79,7 +79,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_active_errors_by_handler(handler_id, params={}, headers=header_basic_auth)
-      info("Finding active errors for handler #{handler_id}")
+      @logger.info("Finding active errors for handler #{handler_id}")
       params['handlerId'] = handler_id
       params['status'] = 'Active'
       find_errors(params, headers)
@@ -92,7 +92,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_active_errors_by_source(source_name, params={}, headers=header_basic_auth)
-      info("Finding active errors for source \"#{source_name}\"")
+      @logger.info("Finding active errors for source \"#{source_name}\"")
       params['source'] = source_name
       params['status'] = 'Active'
       find_errors(params, headers)
@@ -106,7 +106,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_active_errors_by_source_group(source_name, group, params={}, headers=header_basic_auth)
-      info("Finding active errors for source group \"#{source_name} :: #{group}\"")
+      @logger.info("Finding active errors for source group \"#{source_name} :: #{group}\"")
       params['group'] = group
       params['source'] = source_name
       params['status'] = 'Active'
@@ -122,7 +122,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_active_errors_by_tree(source_name, group, tree_name, params={}, headers=header_basic_auth)
-      info("Finding active errors for tree \"#{source_name} :: #{group} :: #{tree_name}\"")
+      @logger.info("Finding active errors for tree \"#{source_name} :: #{group} :: #{tree_name}\"")
       params['tree'] = tree_name
       params['group'] = group
       params['source'] = source_name
@@ -140,7 +140,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_active_errors_by_node(source_name, group, tree_name, node_id, params={}, headers=header_basic_auth)
-      info("Finding active errors for node \"#{source_name} :: #{group} :: #{tree_name} :: #{node_id}\"")
+      @logger.info("Finding active errors for node \"#{source_name} :: #{group} :: #{tree_name} :: #{node_id}\"")
       params['nodeId'] = node_id
       params['tree'] = tree_name
       params['group'] = group
@@ -156,7 +156,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_errors_by_run(run_id, params={}, headers=header_basic_auth)
-      info("Finding active errors for run #{run_id}")
+      @logger.info("Finding active errors for run #{run_id}")
       params['runId'] = run_id
       find_errors(params, headers)
     end

data/lib/kinetic_sdk/task/lib/export.rb

@@ -0,0 +1,32 @@
+module KineticSdk
+  class Task
+
+    # Export all structure definitions to :source-slug.json file in
+    # `export_directory/sources`.
+    #
+    # Exports the following items:
+    #
+    # * sources
+    # * trees
+    # * routines
+    # * handlers
+    # * groups
+    # * policy rules
+    # * categories
+    # * access keys
+    #
+    # @param headers [Hash] hash of headers to send, default is basic authentication
+    # @return nil
+    def export(headers=header_basic_auth)
+      export_sources(headers)
+      export_trees(nil,headers) # Includes routines when nil passed
+      export_handlers(headers)
+      export_groups(headers)
+      export_policy_rules(headers)
+      export_categories(headers)
+      export_access_keys(headers)
+    end
+
+
+  end
+end

data/lib/kinetic_sdk/task/lib/groups.rb

@@ -7,7 +7,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_group(name, headers=default_headers)
-      info("Adding group \"#{name}\"")
+      @logger.info("Adding group \"#{name}\"")
       post("#{@api_url}/groups", { "name" => name }, headers)
     end
 
@@ -17,7 +17,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_group(name, headers=header_basic_auth)
-      info("Deleting Group \"#{name}\"")
+      @logger.info("Deleting Group \"#{name}\"")
       delete("#{@api_url}/groups/#{encode(name)}", headers)
     end
 
@@ -26,7 +26,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_groups(headers=header_basic_auth)
-      info("Deleting all groups")
+      @logger.info("Deleting all groups")
       (find_groups(headers).content['groups'] || []).each do |group|
         delete("#{@api_url}/groups/#{encode(group['name'])}", headers)
       end
@@ -43,20 +43,20 @@ module KineticSdk
         response = find_group(group, {}, headers)
         group = response.content
       end
-      info("Exporting group \"#{group['name']}\" to #{@options[:export_directory]}.")
+      @logger.info("Exporting group \"#{group['name']}\" to #{@options[:export_directory]}.")
       # Create the groups directory if it doesn't yet exist
       group_dir = FileUtils::mkdir_p(File.join(@options[:export_directory], "groups"))
       group_file = File.join(group_dir, "#{group['name'].slugify}.json")
       # write the file
       responseObj = get("#{@api_url}/groups/#{encode(group['name'])}", {}, headers)
       File.write(group_file, JSON.pretty_generate(responseObj.content))
-      info("Exported group: #{group['name']} to #{group_file}")
+      @logger.info("Exported group: #{group['name']} to #{group_file}")
     end
 
     # Export Groups
     #
     # @param headers [Hash] hash of headers to send, default is basic authentication
-    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    # @return nil
     def export_groups(headers=header_basic_auth)
       raise StandardError.new "An export directory must be defined to export groups." if @options[:export_directory].nil?
       (find_groups.content["groups"] || []).each do |group|
@@ -64,13 +64,26 @@ module KineticSdk
       end
     end
 
+    # Import Groups
+    #
+    # @param headers [Hash] hash of headers to send, default is basic authentication
+    # @return nil
+    def import_groups(headers=default_headers)
+      raise StandardError.new "An export directory must be defined to import groups from." if @options[:export_directory].nil?
+      @logger.info("Importing all Groups in Export Directory")
+      Dir["#{@options[:export_directory]}/groups/*.json"].sort.each do |file|
+        group = JSON.parse(File.read(file))
+        add_group(group["name"], headers)
+      end
+    end
+
     # Find all groups
     #
     # @param params [Hash] Query parameters that are added to the URL, such as +include+
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_groups(params={}, headers=header_basic_auth)
-      info("Finding all groups")
+      @logger.info("Finding all groups")
       get("#{@api_url}/groups", params, headers)
     end
 
@@ -81,7 +94,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_group(name, params={}, headers=header_basic_auth)
-      info("Finding the #{name} group")
+      @logger.info("Finding the #{name} group")
       get("#{@api_url}/groups/#{encode(name)}", params, headers)
     end
 
@@ -93,7 +106,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_user_to_group(login_id, group_name, headers=default_headers)
       body = { "loginId" => login_id }
-      info("Adding user \"#{login_id}\" to group \"#{group_name}\"")
+      @logger.info("Adding user \"#{login_id}\" to group \"#{group_name}\"")
       post("#{@api_url}/groups/#{encode(group_name)}/users", body, headers)
     end
 
@@ -104,7 +117,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def remove_user_from_group(login_id, group_name, headers=default_headers)
-      info("Removing user \"#{login_id}\" from group \"#{group_name}\"")
+      @logger.info("Removing user \"#{login_id}\" from group \"#{group_name}\"")
       post("#{@api_url}/groups/#{encode(group_name)}/users/#{encode(login_id)}", headers)
     end
 

data/lib/kinetic_sdk/task/lib/handlers.rb

@@ -7,7 +7,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_handler(definition_id, headers=header_basic_auth)
-      info("Deleting Handler \"#{definition_id}\"")
+      @logger.info("Deleting Handler \"#{definition_id}\"")
       delete("#{@api_url}/handlers/#{definition_id}", headers)
     end
 
@@ -16,7 +16,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_handlers(headers=header_basic_auth)
-      info("Deleting all handlers")
+      @logger.info("Deleting all handlers")
       (find_handlers(headers).content['handlers'] || []).each do |handler|
         delete("#{@api_url}/handlers/#{handler['definition_id']}", headers)
       end
@@ -28,7 +28,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_handlers(params={}, headers=header_basic_auth)
-      info("Find all handlers")
+      @logger.info("Find all handlers")
       get("#{@api_url}/handlers", params, headers)
     end
 
@@ -39,7 +39,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_handler(definition_id, params={}, headers=header_basic_auth)
-      info("Finding handler \"#{definition_id}\"")
+      @logger.info("Finding handler \"#{definition_id}\"")
       get("#{@api_url}/handlers/#{definition_id}", params, headers)
     end
 
@@ -53,10 +53,26 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def import_handler(handler, force_overwrite=false, headers=header_basic_auth)
       body = { "package" => handler }
-      info("Importing Handler #{File.basename(handler)}")
+      @logger.info("Importing Handler #{File.basename(handler)}")
       post_multipart("#{@api_url}/handlers?force=#{force_overwrite}", body, headers)
     end
 
+    # Import handlers from export directory
+    #
+    # If the handlers already exists on the server, this will fail unless forced to overwrite.
+    #
+    # @param force_overwrite [Boolean] whether to overwrite handlers if they exist, default is false
+    # @param headers [Hash] hash of headers to send, default is basic authentication
+    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    def import_handlers(force_overwrite=false, headers=header_basic_auth)
+      raise StandardError.new "An export directory must be defined to import handlers from." if @options[:export_directory].nil?
+      @logger.info("Importing all Handlers from Export Directory")
+      Dir["#{@options[:export_directory]}/handlers/*.zip"].sort.each do |file|
+        handler_file = File.new(file, "rb")
+        import_handler(handler_file, force_overwrite, headers)
+      end
+    end
+
     # Modifies the properties and info values for a handler
     #
     # @param definition_id [String] the definition id of the handler
@@ -64,7 +80,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def update_handler(definition_id, body, headers=default_headers)
-      info("Updating handler #{definition_id}")
+      @logger.info("Updating handler #{definition_id}")
       put("#{@api_url}/handlers/#{definition_id}", body, headers)
     end
 
@@ -72,10 +88,10 @@ module KineticSdk
     #
     # @param definition_id [String] the definition id of the handler
     # @param headers [Hash] hash of headers to send, default is basic authentication
-    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    # @return nil
     def export_handler(definition_id, headers=header_basic_auth)
       raise StandardError.new "An export directory must be defined to export a handler." if @options[:export_directory].nil?
-      info("Exporting handler \"#{definition_id}\" to #{@options[:export_directory]}.")
+      @logger.info("Exporting handler \"#{definition_id}\" to #{@options[:export_directory]}.")
       # Create the handler directory if it doesn't yet exist
       handler_dir = FileUtils::mkdir_p(File.join(@options[:export_directory], "handlers"))
       handler_file = File.join(handler_dir, "#{definition_id}.zip")
@@ -83,16 +99,16 @@ module KineticSdk
       File.open(handler_file, "wb") do |file|
         file.write get("#{@api_url}/handlers/#{definition_id}/zip", {}, headers).content_string
       end
-      info("Exported handler: #{definition_id} to #{handler_file}")
+      @logger.info("Exported handler: #{definition_id} to #{handler_file}")
     end
 
     # Export all handlers
     #
     # @param headers [Hash] hash of headers to send, default is basic authentication
-    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    # @return nil
     def export_handlers(headers=header_basic_auth)
       raise StandardError.new "An export directory must be defined to export handlers." if @options[:export_directory].nil?
-      info("Exporting handlers to #{@options[:export_directory]}.")
+      @logger.info("Exporting handlers to #{@options[:export_directory]}.")
       # Get the handler metadata to geta all handler_ids
       response = find_handlers(headers)
       # Parse the response and export each handler

data/lib/kinetic_sdk/task/lib/health.rb

@@ -5,7 +5,7 @@ module KineticSdk
     #
     # @param url [String] the url to query for a 200 response code
     # @param headers [Hash] hash of headers to send, default is basic authentication
-    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    # @return [Boolean] true if server responded with OK (status 200)
     def is_alive?(url, headers=header_basic_auth)
       response = get(url, {}, headers)
       response.status == 200
@@ -15,14 +15,22 @@ module KineticSdk
     #
     # @param url [String] the url to query for a 200 response code
     # @param headers [Hash] hash of headers to send, default is basic authentication
-    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    # @return nil
     def wait_until_alive(url, headers=header_basic_auth)
       url = url[1..-1] if url.start_with?("/")
       while !is_alive?("#{@api_url}/#{url}", headers) do
-        info("Web server \"#{@api_url}/#{url}\" is not ready, waiting...")
+        @logger.info("Web server \"#{@api_url}/#{url}\" is not ready, waiting...")
         sleep 3
       end
     end
 
+    # Get the server info
+    #
+    # @param headers [Hash] hash of headers to send, default is none
+    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    def server_info(headers={})
+      get(@api_url, {}, headers)
+    end
+
   end
 end

data/lib/kinetic_sdk/task/lib/license.rb

@@ -6,7 +6,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_license(headers=header_basic_auth)
-      info("Deleting the license")
+      @logger.info("Deleting the license")
       delete("#{@api_url}/config/license", {}, headers)
     end
 
@@ -16,7 +16,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_license(params={}, headers=header_basic_auth)
-      info("Finding the license")
+      @logger.info("Finding the license")
       get("#{@api_url}/config/license", params, headers)
     end
 
@@ -27,7 +27,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def update_license(license_content, headers=default_headers)
       body = { "licenseContent" => license_content }
-      info("Updating license")
+      @logger.info("Updating license")
       post("#{@api_url}/config/license", body, headers)
     end
 
@@ -43,7 +43,7 @@ module KineticSdk
         if File.exists? license
           update_license(File.read(license), headers)
         else
-          info("  * License file \"#{license}\" does not exist.")
+          @logger.info("  * License file \"#{license}\" does not exist.")
         end
       end
     end

data/lib/kinetic_sdk/task/lib/policy_rules.rb

@@ -6,7 +6,7 @@ module KineticSdk
     # @param policy [Hash] hash of properties for the new policy rule
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
-    # 
+    #
     # Example
     #
     #     add_policy_rule({
@@ -17,7 +17,7 @@ module KineticSdk
     #     })
     #
     def add_policy_rule(policy, headers=default_headers)
-      info("Adding policy rule \"#{policy['type']} - #{policy['name']}\"")
+      @logger.info("Adding policy rule \"#{policy['type']} - #{policy['name']}\"")
       post("#{@api_url}/policyRules/#{encode(policy['type'])}", policy, headers)
     end
 
@@ -37,7 +37,7 @@ module KineticSdk
     #     })
     #
     def delete_policy_rule(policy, headers=header_basic_auth)
-      info("Deleting policy rule \"#{policy['type']} - #{policy['name']}\"")
+      @logger.info("Deleting policy rule \"#{policy['type']} - #{policy['name']}\"")
       delete("#{@api_url}/policyRules/#{encode(policy['type'])}/#{encode(policy['name'])}", headers)
     end
 
@@ -46,7 +46,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_policy_rules(headers=header_basic_auth)
-      info("Deleting all policy rules")
+      @logger.info("Deleting all policy rules")
       (find_policy_rules(headers).content["policyRules"] || []).each do |policy_rule|
         delete_policy_rule({
           "type" => policy_rule['type'],
@@ -61,10 +61,10 @@ module KineticSdk
     #   - +type+ - Policy Rule type ( API Access | Console Access | Category Access | System Default )
     #   - +name+ - Policy Rule name to export
     # @param headers [Hash] hash of headers to send, default is basic authentication
-    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    # @return nil
     def export_policy_rule(policy_rule, headers=header_basic_auth)
       raise StandardError.new "An export directory must be defined to export a policy rule." if @options[:export_directory].nil?
-      info("Exporting policy rule \"policy_rule['type']\" : \"#{policy_rule['name']}\" to #{@options[:export_directory]}.")
+      @logger.info("Exporting policy rule \"policy_rule['type']\" : \"#{policy_rule['name']}\" to #{@options[:export_directory]}.")
       # Create the policy rules directory if it doesn't yet exist
       dir = FileUtils::mkdir_p(File.join(@options[:export_directory], "policyRules"))
       file = File.join(dir, "#{policy_rule['type'].slugify}-#{policy_rule['name'].slugify}.json")
@@ -76,7 +76,7 @@ module KineticSdk
           headers
         )
         if response.status != 200
-          info("Failed to export policy rule: #{policy_rule['type']} - #{policy_rule['name']}: #{response.inspect}")
+          @logger.info("Failed to export policy rule: #{policy_rule['type']} - #{policy_rule['name']}: #{response.inspect}")
           policy_rule = nil
         else
           policy_rule = response.content
@@ -86,14 +86,14 @@ module KineticSdk
       unless policy_rule.nil?
         # write the file
         File.write(file, JSON.pretty_generate(policy_rule))
-        info("Exported policy rule: #{policy_rule['type']} - #{policy_rule['name']} to #{file}")
+        @logger.info("Exported policy rule: #{policy_rule['type']} - #{policy_rule['name']} to #{file}")
       end
     end
 
     # Export Policy Rules
     #
     # @param headers [Hash] hash of headers to send, default is basic authentication
-    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    # @return nil
     def export_policy_rules(headers=header_basic_auth)
       raise StandardError.new "An export directory must be defined to export policy rules." if @options[:export_directory].nil?
       response = find_policy_rules({"include" => "consolePolicyRules"}, headers)
@@ -102,13 +102,26 @@ module KineticSdk
       end
     end
 
+    # Import Policy Rules
+    #
+    # @param headers [Hash] hash of headers to send, default is basic authentication
+    # @return nil
+    def import_policy_rules(headers=default_headers)
+      raise StandardError.new "An export directory must be defined to import policy rules from." if @options[:export_directory].nil?
+      @logger.info("Importing all Policy Rules in Export Directory")
+      Dir["#{@options[:export_directory]}/policyRules/*.json"].sort.each do |file|
+        policy_rule = JSON.parse(File.read(file))
+        add_policy_rule(policy_rule, headers)
+      end
+    end
+
     # Find Policy Rules.
     #
     # @param params [Hash] Query parameters that are added to the URL, such as +include+
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_policy_rules(params={}, headers=header_basic_auth)
-      info("Finding Policy Rules")
+      @logger.info("Finding Policy Rules")
       policy_rules = []
       response = nil
       ["API Access", "Category Access", "Console Access", "System Default"].each do |type|
@@ -136,7 +149,7 @@ module KineticSdk
     #     find_policy_rule({ "type" => "API Access", "name" => "Allow All"})
     #
     def find_policy_rule(policy_rule, params={}, headers=header_basic_auth)
-      info("Finding the \"#{policy_rule['type']} - #{policy_rule['name']}\" Policy Rule")
+      @logger.info("Finding the \"#{policy_rule['type']} - #{policy_rule['name']}\" Policy Rule")
       get("#{@api_url}/policyRules/#{encode(policy_rule['type'])}/#{encode(policy_rule['name'])}", params, headers)
     end
 
@@ -158,7 +171,7 @@ module KineticSdk
     #     )
     #
     def update_policy_rule(policy_rule, body={}, headers=default_headers)
-      info("Updating the \"#{policy_rule['type']} - #{policy_rule['name']}\" Policy Rule")
+      @logger.info("Updating the \"#{policy_rule['type']} - #{policy_rule['name']}\" Policy Rule")
       put("#{@api_url}/policyRules/#{encode(policy_rule['type'])}/#{encode(policy_rule['name'])}", body, headers)
     end