akamai_cloudlet_manager 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3097dba680e9840c7433cb9891fffae7c4ec3df4
-  data.tar.gz: 992429969fd5c9de85e9e2ddc6e2d468a4f3d68f
+  metadata.gz: f33e1ce2cf65b398f20153bacd85f6f7d2df49af
+  data.tar.gz: e4e4d7d402bdedb30527ff8ba0082c84e230cecd
 SHA512:
-  metadata.gz: d7da5aea3185c4a29ed76642fa56263e0e304e9d352754d93987789ff39bdda4c2615f6c19739499c0dc5bf033209f1c7e8266e55a71490c87e1b17a6c86455b
-  data.tar.gz: 03c52fda46f04ba25d38c0a4e6d508488f1489a647d5749d63ba66204c649782dac273f68f936b0e991422d14ac3d7f679ec6a0a277676f43c970e7cb49b912e
+  metadata.gz: 012ae566e4d7e58c6fc2eb6d10e1488a9d26322e3a548f5525d1ac5d1872bf8ee28b7c18fe5c29d1a9ddcb76329083987d126d378348eccb0cbd054c3675d308
+  data.tar.gz: f1f26d134b1c7d01eeba2df7e1e51233c960f22ae2f907cd5590927c2698d8c9b547c1c3d6cdc266b6ecc735e9b29cb4cfc460e874babbbdb04f0b6a245377ec

data/bin/acm

@@ -39,8 +39,7 @@ class AkamaiCloudletManagerCli < Thor
         puts "No policy versions available"
       end
     rescue => err
-      puts "cloning failed!"
-      puts "Exception: #{err}"
+      puts "Exception: #{err.formatted_exception("Policy cloning failed!")}"
       err
     end
   end
@@ -48,7 +47,7 @@ class AkamaiCloudletManagerCli < Thor
   desc "update_policy_version", "Updates the policy version"
   long_desc <<-LONGDESC
   Updates the policy version. Policy version can be updated only in draft mode, not when it is activated.
-    With --policy, policy on which version to be updated
+    With --policy_id, policy on which version to be updated
     With --draft_version, version which needs to be updated, this must be inactive version
     With --file_path, file_path from which rules can be constructed and updated to policy version
     With --rule_name, rule name so that it is visible in akamai control panel
@@ -66,7 +65,7 @@ class AkamaiCloudletManagerCli < Thor
   method_option :rule_type,     required: false
   method_option :cookie_rules,  required: false
   def update_policy_version
-    puts "updates the policy version"
+    puts "updating the policy version"
     policy_version = AkamaiCloudletManager::PolicyVersion.new({
                                                                 policy_id: options[:policy_id],
                                                                 version_id: options[:draft_version]
@@ -79,6 +78,40 @@ class AkamaiCloudletManagerCli < Thor
     end
   end
 
+  desc "append_rules_to_policy_version", "Appends new rules to existing policy version"
+  long_desc <<-LONGDESC
+  Append new rules to existing policy version. Policy version can be updated only in draft mode, not when it is activated.
+    With --policy_id, policy on which version to be updated
+    With --draft_version, version which needs to be updated, this must be inactive version
+    With --file_path, file_path from which rules can be constructed and updated to policy version
+    With --rule_name, rule name so that it is visible in akamai control panel
+    With --origin_id, origin's id, this can be found from "get_policy_versions" command
+    With --rule_type, rule type, e.g. "albMatchRule"
+    With --cookie_rules, from which cookie rules can be constructed and updated to policy version, e.g. "abc=xyz"
+
+    LONGDESC
+
+  method_option :policy_id,     required: true
+  method_option :draft_version, required: true
+  method_option :file_path,     required: true
+  method_option :rule_name,     required: true
+  method_option :origin_id,     required: true
+  method_option :rule_type,     required: false
+  method_option :cookie_rules,  required: false
+  def append_rules_to_policy_version
+    puts "Appending rules to draft policy version with existing rules"
+    policy_version = AkamaiCloudletManager::PolicyVersion.new({
+                                                                policy_id: options[:policy_id],
+                                                                version_id: options[:draft_version]
+                                                              })
+    begin
+      puts policy_version.append(options)
+    rescue => err
+      puts "Exception: #{err.formatted_exception("Policy version update failed!")}"
+      err
+    end
+  end
+
   desc "activate_policy_version", "Activate the policy version on a given network(staging/production)"
   long_desc <<-LONGDESC
   Activates the policy version
@@ -91,7 +124,7 @@ class AkamaiCloudletManagerCli < Thor
   method_option :version, required: true
   method_option :network, required: true, enum: ['staging','production']
   def activate_policy_version
-    puts "activates the policy version"
+    puts "activating the policy version"
     policy_version = AkamaiCloudletManager::PolicyVersion.new({
                                                                 policy_id: options[:policy_id],
                                                                 version_id: options[:version]
@@ -102,8 +135,7 @@ class AkamaiCloudletManagerCli < Thor
       puts options[:version]
       puts policy_version.activate(options[:network])
     rescue => err
-      puts "activation failed!"
-      puts "Exception: #{err}"
+      puts "Exception: #{err.formatted_exception("Policy activation failed!")}"
       err
     end
   end

data/lib/akamai_cloudlet_manager/detail.rb

@@ -11,7 +11,6 @@ module AkamaiCloudletManager
     def info
       request  = Net::HTTP::Get.new URI.join(@base_uri.to_s, "cloudlets/api/v2/cloudlet-info/#{@cloudlet_id}").to_s
       response = @http_host.request(request)
-      # puts response.body
       response.body
     end
 
@@ -19,7 +18,6 @@ module AkamaiCloudletManager
     def list
       request  = Net::HTTP::Get.new URI.join(@base_uri.to_s, "cloudlets/api/v2/cloudlet-info?#{@group_id}").to_s
       response = @http_host.request(request)
-      # puts response.body
       response.body
     end
   end

data/lib/akamai_cloudlet_manager/origin.rb

@@ -5,7 +5,6 @@ module AkamaiCloudletManager
     def list(type)
       request  = Net::HTTP::Get.new URI.join(@base_uri.to_s, "cloudlets/api/v2/origins?type=#{type}").to_s
       response = @http_host.request(request)
-      # puts response.body
       response.body
     end
   end

data/lib/akamai_cloudlet_manager/policy.rb

@@ -12,7 +12,6 @@ module AkamaiCloudletManager
         "/cloudlets/api/v2/policies/#{@policy_id}/properties"
       ).to_s
       response = @http_host.request(request)
-      # puts response.body
       response.body
     end
   end

data/lib/akamai_cloudlet_manager/policy_version.rb

@@ -7,11 +7,9 @@ module AkamaiCloudletManager
     end
 
     # Get Policy version's rules
-    # request  = Net::HTTP::Get.new URI.join(@base_uri.to_s, "cloudlets/api/v2/policies/38548/versions/1?omitRules=false&matchRuleFormat=1.0"').to_s
-    def rules
+    def existing_rules
       request  = Net::HTTP::Get.new URI.join(@base_uri.to_s, "cloudlets/api/v2/policies/#{@policy_id}/versions/#{@version_id}?omitRules=false&matchRuleFormat=1.0").to_s
       response = @http_host.request(request)
-      # puts response.body
       response.body
     end
 
@@ -23,7 +21,6 @@ module AkamaiCloudletManager
         "cloudlets/api/v2/policies/#{@policy_id}/versions?includeRules=false&matchRuleFormat=1.0"
       ).to_s
       response = @http_host.request(request)
-      # puts response.body
       response.body
     end
 
@@ -37,7 +34,6 @@ module AkamaiCloudletManager
         { 'Content-Type' => 'application/json'}
       )
       response = @http_host.request(request)
-      # puts response.body
       response.body
     end
 
@@ -54,17 +50,26 @@ module AkamaiCloudletManager
         "network": network
       }.to_json
       response = @http_host.request(request)
-      # puts response.body
       response.body
     end
 
+    def append(options={})
+      # Removing location is mandatory from matchRules, otherwise we see this error:
+      # matchRules : object instance has properties which are not allowed by the schema: [\"location\"]\n"
+      rules = JSON.parse(existing_rules)
+      rules = rules["matchRules"].map{|rule| rule.delete('location'); rule; }
+
+      update(options, rules)
+    end
+
     # Update policy version, all rules
-    def update(options = {})
+    def update(options = {}, existing_rules = [])
+
       request = Net::HTTP::Put.new(
           URI.join(@base_uri.to_s, "cloudlets/api/v2/policies/#{@policy_id}/versions/#{@version_id}?omitRules=false&matchRuleFormat=1.0").to_s,
           { 'Content-Type' => 'application/json'}
         )
-      rules = generate_path_rules(options) + generate_cookie_rules(options)
+      rules = generate_path_rules(options) + generate_cookie_rules(options) + existing_rules
 
       if rules.empty?
         puts "No rules to apply, please check syntax"
@@ -80,9 +85,9 @@ module AkamaiCloudletManager
 
     # All the path rules from one file will be added under same match, space separated
     def generate_path_rules(options={})
-      return [] if options[:file_path].empty?
+      return [] if options[:file_path].nil? || options[:file_path].empty?
 
-      options     = options.merge(match_operator: 'equals', match_type: 'path')
+      options     = options.merge(match_operator: 'contains', match_type: 'path')
       counter     = 0
       match_value = []
 
@@ -99,19 +104,19 @@ module AkamaiCloudletManager
 
       match_rules(match_value, options)
     rescue => err
-      puts "Exception: #{err}"
+      puts "Exception: #{err.formatted_exception("Path rules generation failed!")}"
       err
     end
 
     # All the path rules from one file will be added under same match, space separated
     def generate_cookie_rules(options = {})
-      return [] if options[:cookie_rules].empty?
+      return [] if options[:cookie_rules].nil? || options[:cookie_rules].empty?
 
       options = options.merge(match_operator: 'contains', match_type: 'cookie')
 
       match_rules(options[:cookie_rules], options)
     rescue => err
-      puts "Exception: #{err}"
+      puts "Exception: #{err.formatted_exception("Cookie rules generation failed!")}"
       err
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akamai_cloudlet_manager
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Gourav Tiwari
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: akamai-edgegrid
@@ -125,7 +125,7 @@ files:
 - lib/akamai_cloudlet_manager/policy_version.rb
 homepage: https://github.com/gouravtiwari/akamai-cloudlet-manager
 licenses:
-- Apache License
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []