enfcli 4.1.0.pre.beta → 5.0.1

data/lib/enfcli/commands/xdns.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Xaptum,Inc
+# Copyright 2019-2020 Xaptum,Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 require "enfthor"
-require "enfapi"
+require "enfapi/dns"
 
 module EnfCli
   module Cmd
@@ -46,9 +46,9 @@ module EnfCli
         end
 
         def display_zones_table(zones)
-          headings = ["Id", "Zone", "Description", "Enf Domain"]
+          headings = ["Id", "Zone", "Description", "Privileged", "Enf Domain"]
           rows = zones.map { |hash|
-            [hash[:id], hash[:zone_domain_name], hash[:description], hash[:enf_domain]]
+            [hash[:id], hash[:zone_domain_name], hash[:description], hash[:privileged], hash[:enf_domain]]
           }
           render_table(headings, rows)
         end
@@ -82,6 +82,7 @@ module EnfCli
       method_option :'zone-domain-name', :type => :string, :required => true
       method_option :description, :type => :array, :banner => "DESCRIPTION"
       method_option :'enf-domain', :type => :string, :banner => "/48 Enf Domain"
+      method_option :'enf-network', :type => :string, :banner => "/64 Enf Network"
 
       def create_zone
         try_with_rescue_in_session do
@@ -91,12 +92,16 @@ module EnfCli
           ## Gather parameters
           zone_domain_name = options["zone-domain-name"]
           description = array_option_to_string(options.description) if options.description
-          case session[:type]
-          when "XAPTUM_ADMIN"
+          if EnfCli::CTX.instance.xaptum_admin?
             enf_domain = options["enf-domain"]
             raise "No value provided for required options '--enf-domain'" unless enf_domain
           else
-            enf_domain = session[:domain_network]
+            enf_domain = session[:domain]
+          end
+
+          enf_network = options["enf-network"]
+          unless EnfCli::CTX.instance.edit_domain_role?
+            raise "No value provided for required option '--enf-network'" unless enf_network
           end
 
           ## create request hash
@@ -106,6 +111,9 @@ module EnfCli
             :enf_domain => enf_domain,
           }
 
+          ## add enf_network to request if present
+          new_zone[:enf_network] = enf_network if enf_network
+
           ## call api
           data = EnfApi::Dns.instance.create_dns_zone new_zone
           zones = data[:data]
@@ -125,12 +133,11 @@ module EnfCli
           ## session
           session = EnfCli::CTX.instance.session
 
-          case session[:type]
-          when "XAPTUM_ADMIN"
+          if EnfCli::CTX.instance.xaptum_admin?
             enf_domain = options["enf-domain"]
             raise "No value provided for required options '--enf-domain'" unless enf_domain
           else
-            enf_domain = session[:domain_network]
+            enf_domain = session[:domain]
           end
 
           ## call api

data/lib/enfcli/commands/xfw.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 require "enfthor"
-require "enfapi"
+require "enfapi/firewall"
 require "base64"
 require "digest"
 require "openssl"
@@ -44,7 +44,8 @@ module EnfCli
       def list_firewall_rules
         try_with_rescue_in_session do
           # call the api
-          rules = EnfApi::Firewall.instance.list_firewall_rules options[:network]
+          data = EnfApi::Firewall.instance.list_firewall_rules options[:network]
+          rules = data[:data]
 
           # display empty table and return
           if rules.length == 0
@@ -117,10 +118,12 @@ module EnfCli
           }
 
           # call the api
-          EnfApi::Firewall.instance.add_firewall_rule options[:network], rule
+          data = EnfApi::Firewall.instance.add_firewall_rule options[:network], rule
+          rules = data[:data]
 
           # print success
           say "Created firewall rule!", :green
+          display_firewall_rules rules
         end
       end
 

data/lib/enfcli/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2018 Xaptum,Inc
+# Copyright 2018-2020 Xaptum,Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +14,5 @@
 # limitations under the License.
 #
 module EnfCli
-  VERSION = "4.1.0-beta"
+  VERSION = "5.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enfcli
 version: !ruby/object:Gem::Version
-  version: 4.1.0.pre.beta
+  version: 5.0.1
 platform: ruby
 authors:
 - Venkatakumar Srinivasan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -243,6 +243,9 @@ files:
 - enfcli.gemspec
 - format.sh
 - lib/enfapi.rb
+- lib/enfapi/dns.rb
+- lib/enfapi/firewall.rb
+- lib/enfapi/user.rb
 - lib/enfcli.rb
 - lib/enfcli/commands/captive.rb
 - lib/enfcli/commands/user.rb
@@ -266,9 +269,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: