arc_weld 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8be92b6b4bc6671d3fad7ecbd85bdc9f416dca81
-  data.tar.gz: 34fff3801941baa988e048d7a4ee67d3076dab92
+  metadata.gz: 185b20cf9daefae896f7e79f91a4e7dcc65433d9
+  data.tar.gz: 30e29565d435aacb40f9926f9250bf802d0cd807
 SHA512:
-  metadata.gz: 0e72e252985832fab45a9d4005a1b9a0962ee36975d96ac075f80ab2427662f8047d098d2ce2a73ab1b4d37a929f058fe9361cbf0c7f36b506c5b54d477c3d89
-  data.tar.gz: 8444e68093ca41fb9e69885a0c36d4c4ec0f31e836e9825331181ac455440324222702480c430807bc58e1814ab97cf38b5051c99c23d76c806194e3db54b94d
+  metadata.gz: fa66678d4b1d2fcea65c461cf0b97f670c4e0de2cb78fe2e42fa59f9e3be626b3c2a29e60b0d2bc7b434ba46f6c2d32baa8610abc4d5be755523494cbe05f3b1
+  data.tar.gz: 12c2ab85729ce8ed1c8931288bddb1274acbf0ac509a5f3401e346ba6e94655d63998bdefbf72cdcaab9844e5a14306ac434a650893802eb7d0c7b6d730dea7a

data/Gemfile

@@ -1,3 +1,4 @@
-source 'https://rubygems.org'
+source 'https://artifacts.ercot.com/mirrors/rubygems/'
+#source 'https://rubygems.org'
 
 gemspec

data/lib/arc_weld/cli.rb

@@ -1,6 +1,7 @@
 require 'arc_weld'
 require 'arc_weld/cli/project'
 require 'arc_weld/cli/readers/relation_csv'
+require 'arc_weld/cli/readers/relation_csv_category_uri'
 require 'arc_weld/cli/readers/resource_csv'
 require 'openssl'
 require 'json'

data/lib/arc_weld/cli/project.rb

@@ -82,11 +82,11 @@ module ArcWeld
         relationships.each do |rel|
           klass = ArcWeld::Cli::RelationReaders.const_get(constantize(rel['driver']))
           rel_reader = klass.new(
-            path:               File.join(input_dir,rel['file']),
-            relationship_type: rel['type'] )
-          sources = resources[rel_reader.src_type]
-          dests   = resources[rel_reader.dst_type]
-          rel_reader.relate(sources,dests)
+            path:              File.join(input_dir,rel['file']),
+            relationship_type: rel['type']
+           )
+
+          rel_reader.relate(resources)
         end
       end
 

data/lib/arc_weld/cli/readers/relation_csv.rb

@@ -21,10 +21,19 @@ module ArcWeld
           self
         end
 
-        def relate(sources,destinations)
+        def sources(inputs)
+          inputs[src_type]
+        end
+
+        def destinations(inputs)
+          inputs[dst_type]
+        end
+
+        def relate(inputs)
           csv.each do |selected_src, selected_dst|
-            src_instance=sources.find {|s| s.send(src_select)==selected_src}
-            dst_instance=destinations.find {|s| s.send(dst_select)==selected_dst}
+            src_instance=sources(inputs).find {|s| s.send(src_select) == selected_src }
+            dst_instance=destinations(inputs).find {|s| s.send(dst_select) == selected_dst}
+            
             if (src_instance.nil? || dst_instance.nil?)
               STDERR.puts format('could not %s %s/%s',
                                  relationship_type,

data/lib/arc_weld/cli/readers/relation_csv_category_uri.rb

@@ -0,0 +1,46 @@
+module ArcWeld
+  module Cli
+    module RelationReaders
+      class CsvCategoryUri
+        include ArcWeld::Helpers
+        attr_accessor :path, :src_select, :src_class, :relationship_type
+
+        attr_accessor :inputs
+        attr_reader   :csv, :keys, :src_type
+
+        def initialize(*args)
+          Hash[*args].each {|k,v| self.send(format('%s=',k),v)}
+          @csv = CSV.open(path)
+          @keys = csv.readline
+          @src_type, @src_select, *unused= keys.flat_map do |k|
+             k.split(':')
+          end
+          @src_class=ArcWeld.const_get(constantize(src_type))
+          self
+        end
+
+        def sources(inputs)
+          inputs[src_type]
+        end
+
+        def destinations(inputs)
+          []
+        end
+
+        def relate(inputs)
+          csv.each do |selected_src, category_uri|
+            src_instance=sources(inputs).find {|s| s.send(src_select)==selected_src}
+            
+            if (src_instance.nil?)
+              STDERR.puts format('could not %s %s/%s',
+                                 relationship_type,
+                                 selected_src)
+            else
+               src_instance.send(relationship_type,category_uri)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/arc_weld/relationships/in_category.rb

@@ -2,6 +2,14 @@ module ArcWeld
   module Relationships
     module InCategory
 
+      def add_category_uri(uri)
+        if (uri.match(%r{\A/All Asset Categories/}))
+          ref = ArcWeld::Reference.new(type: 'Group', uri: uri)
+          add_category(ref)
+        end  # silent fail?
+
+      end
+
       def add_category(cat)
         unless in_category.include?(cat.ref)
           in_category << cat.ref

data/lib/arc_weld/resource.rb

@@ -31,7 +31,14 @@ module ArcWeld
     end
 
     def parent_ref=(containing_group)
-      @parent_ref = containing_group.ref
+      @parent_ref = containing_group.ref if containing_group.ref.type=='Group'
+    end
+
+    def parent_uri=(uri)
+      top_root = Regexp.new(format('\A%s',self.class.toplevel.uri))
+      if top_root.match(uri)
+        @parent_ref = ArcWeld::Reference.new(uri: uri)
+      end
     end
 
     def identity_hash

data/lib/arc_weld/resources/group.rb

@@ -4,7 +4,7 @@ module ArcWeld
     include ArcWeld::Relationship
 
     resource_property :containedResourceType, :description, :memberReferencePage
-    has_relationship  :has_child, :in_category, :in_network, :has_customer, multiple: true
+    has_relationship  :has_child, :in_category, :in_network, multiple: true
 
     def self.class_id
       fail TypeError, 'no group resource class_id'

data/lib/arc_weld/templates/project-csv/in/customer_networks.csv.tt

@@ -0,0 +1,3 @@
+customer:externalID,network:externalID
+weld_customer_stage,weld_net_stage
+weld_customer_decom,weld_net_decom

data/lib/arc_weld/templates/project-csv/in/group_categories.csv.tt

@@ -1,3 +1,4 @@
-group:externalID,asset_category:externalID
-weld_asset_root,weld_category_assets
-weld_zone_root,weld_category_zones
+group:externalID,uri
+weld_asset_root,/All Asset Categories/<%= @config[:name] -%> Categories/Welded Assets
+weld_zone_root,/All Asset Categories/<%= @config[:name] -%> Categories/Welded Zones
+weld_zone_root,/All Asset Categories/Site Asset Categories/Address Spaces/Protected

data/lib/arc_weld/templates/project-csv/in/zonegroup_networks.csv.tt

@@ -0,0 +1,2 @@
+group:externalID,network:externalID
+weld_zone_root,weld_net_stage

data/lib/arc_weld/templates/project-csv/weld.json.tt

@@ -27,13 +27,18 @@
     },
     {
       "driver" : "csv",
-      "type"   : "add_category",
+      "type"   : "add_network",
+      "file"   : "zonegroup_networks.csv"
+    },
+    {
+      "driver" : "csv_category_uri",
+      "type"   : "add_category_uri",
       "file"   : "group_categories.csv"
     },
     {
       "driver" : "csv",
       "type"   : "add_customer_resource",
-      "file"   : "customer_groups.csv"
+      "file"   : "customer_networks.csv"
     }
   ]
 }

data/lib/arc_weld/version.rb

@@ -1,3 +1,3 @@
 module ArcWeld
-  VERSION = '0.2.5'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arc_weld
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Breed
@@ -203,6 +203,7 @@ files:
 - lib/arc_weld/cli.rb
 - lib/arc_weld/cli/project.rb
 - lib/arc_weld/cli/readers/relation_csv.rb
+- lib/arc_weld/cli/readers/relation_csv_category_uri.rb
 - lib/arc_weld/cli/readers/resource_csv.rb
 - lib/arc_weld/helpers.rb
 - lib/arc_weld/reference.rb
@@ -226,16 +227,16 @@ files:
 - lib/arc_weld/resources/network.rb
 - lib/arc_weld/resources/zone.rb
 - lib/arc_weld/templates/project-csv/.gitignore.tt
-- lib/arc_weld/templates/project-csv/Gemfile.tt
 - lib/arc_weld/templates/project-csv/Thorfile.tt
 - lib/arc_weld/templates/project-csv/in/assets.csv.tt
 - lib/arc_weld/templates/project-csv/in/categories.csv.tt
-- lib/arc_weld/templates/project-csv/in/customer_groups.csv.tt
+- lib/arc_weld/templates/project-csv/in/customer_networks.csv.tt
 - lib/arc_weld/templates/project-csv/in/customers.csv.tt
 - lib/arc_weld/templates/project-csv/in/group_categories.csv.tt
 - lib/arc_weld/templates/project-csv/in/locations.csv.tt
 - lib/arc_weld/templates/project-csv/in/networks.csv.tt
 - lib/arc_weld/templates/project-csv/in/zone_locations.csv.tt
+- lib/arc_weld/templates/project-csv/in/zonegroup_networks.csv.tt
 - lib/arc_weld/templates/project-csv/in/zones.csv.tt
 - lib/arc_weld/templates/project-csv/lib/thor/README.txt.tt
 - lib/arc_weld/templates/project-csv/lib/thor/sample.thor.tt
@@ -261,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Toolkit for building ArcSight resources

data/lib/arc_weld/templates/project-csv/Gemfile.tt

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-# add local gems here

data/lib/arc_weld/templates/project-csv/in/customer_groups.csv.tt

@@ -1,3 +0,0 @@
-customer:externalID,group:ref_uri
-weld_customer_stage,/All Networks/ArcWeld
-weld_customer_stage,/All Zones/<%= @config[:name] %>