add migration switch

Author: terrywbrady

src-colladmin/Gemfile

@@ -12,7 +12,7 @@ gem 'aws-sdk-lambda'
 gem 'aws-sdk-s3'
 gem 'aws-sdk-ssm'
 gem 'csv'
-gem 'mrt-zk', git: 'https://github.com/CDLUC3/mrt-zk.git', tag: '1.0.1.l'
+gem 'mrt-zk', git: 'https://github.com/CDLUC3/mrt-zk.git', tag: '1.0.2.a'
 gem 'rest-client'
 gem 'rubocop'
 gem 'uc3-ssm', '0.3.10', git: 'https://github.com/CDLUC3/uc3-ssm.git', branch: 'main'

src-colladmin/actions/zookeeper_action.rb

@@ -31,55 +31,6 @@ def to_table
   end
 end
 
-class QueueItemReader
-  @@na = "NA"
-  def initialize(zk_action, id, payload)
-    @bytes = payload.nil? ? [] : payload.bytes
-    @is_json = zk_action.is_json
-    @status_vals = zk_action.status_vals
-    @queue_node = zk_action.zk_path
-    @id = id
-  end
-
-  def status_byte
-    @bytes.empty? ? 0 : @bytes[0]
-  end
-
-  def status
-    return @@na if status_byte > @status_vals.length
-    @status_vals[status_byte]
-  end
-
-  def time
-    return nil if @bytes.length < 9
-      # https://stackoverflow.com/a/68855488/3846548
-      t = @bytes[1..8].inject(0) {|m, b| (m << 8) + b }
-    Time.at(t/1000)
-  end
-
-  def payload_text
-    return "" if @bytes.length < 10
-    @bytes[9..].pack('c*')
-  end
-
-  def payload_object
-    if @is_json
-      json = JSON.parse(payload_text)
-    else
-      json = {
-        payload: payload_text
-      }
-    end
-    json['queueNode'] = @queue_node
-    json['id'] = @id
-    json['date'] = time
-    json['status'] = status
-    json
-  end
-
-end
-
-
 class ZookeeperAction < AdminAction
   def initialize(config, action, path, myparams, filters)
     super(config, action, path, myparams)
@@ -88,6 +39,15 @@ def initialize(config, action, path, myparams, filters)
     @items = ZkList.new
   end
 
+  def migration_level
+    return :m1 if @zk.exists?("/migration/m1")
+    :none
+  end
+
+  def migration_m1?
+    migration_level == :m1
+  end
+
   def zk_path
     '/tbd'
   end
@@ -109,17 +69,10 @@ def register_item(item)
   end
 
   def perform_action
-    jobs = MerrittZK::LegacyIngestJob.list_jobs(@zk)
+    jobs = migration_m1? ? MerrittZK::Job.list_jobs(@zk) : MerrittZK::LegacyIngestJob.list_jobs(@zk)
     jobs.each do |po|
       register_item(QueueEntry.new(po))
     end
-    if false
-      @zk.children(zk_path).each do |cp|
-        arr = @zk.get("#{zk_path}/#{cp}")
-        po = QueueItemReader.new(self, cp, arr[0]).payload_object
-        register_item(QueueEntry.new(po))
-      end
-    end
     convert_json_to_table('')
   end