MuranoCLI 3.2.0.beta.1 → 3.2.0.beta.5

data/lib/MrMurano/Solution-Services.rb

@@ -38,7 +38,7 @@ module MrMurano
       # :nocov:
     end
 
-    def fetch(name)
+    def fetch(name, _untainted=false)
       raise 'Missing name!' if name.nil?
       raise 'Empty name!' if name.empty?
       ret = get('/' + CGI.escape(name))
@@ -102,6 +102,9 @@ module MrMurano
 
       return unless upload_item_allowed(therealias)
 
+      get_again = false
+      create_it = false
+
       put('/' + therealias, pst) do |request, http|
         response = http.request(request)
         isj, jsn = isJSON(response.body)
@@ -109,16 +112,14 @@ module MrMurano
         # EXPLAIN: How come `case response ... when Net:HTTPNoContent` works?
         #   It seems magical, since response is a class and here we use is_a?.
         if response.is_a?(Net::HTTPNoContent)
-          # 2017-08-07: When did Murano start returning 204?
+          # 2017-08-07: (lb): When did Murano start returning 204?
           #   This seems to happen when updating an existing service.
           #   Unfortunately, we don't get the latest updated_at, so
           #   a subsequent status will show this module as dirty.
-          ret = get('/' + CGI.escape(name))
-          if ret.is_a?(Hash) && ret.key?(:updated_at)
-            updated_at = ret[:updated_at]
-          else
-            warning "Failed to verify updated_at: #{ret}"
-          end
+          # (lb): Don't call get() from the put() handler, it just seems
+          #   like bad form to start a new call before the existing one is
+          #   complete!
+          get_again = true
         elsif response.is_a?(Net::HTTPSuccess)
           # A first upload will see a 200 response and a JSON body.
           # A subsequent upload of the same item sees 204 and no body.
@@ -127,18 +128,29 @@ module MrMurano
           updated_at = jsn[:updated_at] unless jsn.nil?
         elsif response == Net::HTTPNotFound
           verbose "Doesn't exist, creating"
-          post('/', pst)
+          create_it = true
         else
           relpath = localpath.sub(File.join(Dir.pwd, ''), '')
           if response.is_a?(Net::HTTPBadRequest) && isj && jsn[:message] == 'Validation errors'
             warning "Validation errors detected in #{relpath}:"
-            puts MrMurano::Pretties.makeJsonPretty(jsn[:errors], Struct.new(:pretty).new(true))
+            puts MrMurano::Pretties.makeJsonPretty(
+              jsn[:errors], Struct.new(:pretty).new(true),
+            )
           else
             showHttpError(request, response)
           end
           warning "Failed to upload: #{relpath}"
         end
       end
+      if get_again
+        ret = get('/' + CGI.escape(name))
+        if ret.is_a?(Hash) && ret.key?(:updated_at)
+          updated_at = ret[:updated_at]
+        else
+          warning "Failed to verify updated_at: #{ret}"
+        end
+      end
+      post('/', pst) if create_it
       cache_update_time_for(localpath, updated_at)
     end
 
@@ -228,13 +240,23 @@ module MrMurano
       return nil unless cache_file.file?
       ret = nil
       cache_file.open('r') do |io|
-        cache = YAML.load(io)
+        begin
+          cache = YAML.load(io)
+        rescue StandardError => err
+          # This could be solely Psych::SyntaxError but let's catch 'em all.
+          # (lb): We could suggest to the user that they delete the
+          #  cache file, but I'd rather understand what's going on.
+          #  If anything, the user seeing this error should send us
+          #  a copy of their cache files.
+          warning("ERROR: Could not load the cache file at: #{cache_file}")
+          warning(err.to_s)
+        end
         return nil unless cache
         if cache.key?(local_path.to_s)
           entry = cache[local_path.to_s]
-          debug("For #{local_path}:")
-          debug(" cached: #{entry}")
-          debug(" cm: #{cksm}")
+          debug("For path #{local_path}:")
+          debug("  cached: #{entry}")
+          debug("  cm: #{cksm}")
           if entry.is_a?(Hash)
             if entry[:sha1] == cksm && entry.key?(:updated_at)
               ret = Time.parse(entry[:updated_at])
@@ -472,7 +494,7 @@ module MrMurano
       end
     end
 
-    def fetch(name)
+    def fetch(name, _untainted=false)
       ret = get('/' + CGI.escape(name))
       unless ret.is_a?(Hash) && !ret.key?(:error)
         error "Fetch for #{name} returned nil or error; skipping"
@@ -480,7 +502,11 @@ module MrMurano
       end
       aheader = (ret[:script].lines.first || '').chomp
       dheader = "--#EVENT #{ret[:service]} #{ret[:event]}"
+      # FIXME/2018-04-24: (lb): What about untainted ?? And this weird double-yield?
+      #   We may want to yield/return unadulterated ret[:script] if just diffing.
       if block_given?
+        # ANSWER/2018-04-24: (lb): If header's do not match, what about ret[:script]?
+        #   Or do both yields get called?? Smells very strange.
         yield dheader + "\n" if aheader != dheader
         yield ret[:script]
       else
@@ -515,52 +541,53 @@ module MrMurano
       # This only finds the last event in a file.
       # :legacy support doesn't allow for that. But that's ok.
       path = Pathname.new(path) unless path.is_a?(Pathname)
+      items = []
       cur = nil
       lineno = 0
       path.readlines.each do |line|
+        lineno += 1
         # @match_header finds a service and an event string, e.g., "--EVENT svc evt\n"
         md = @match_header.match(line)
         if !md.nil?
-          service, config_var = decode_config_var(md[:service])
-          event_event, event_type = resolve_event_type(service, md[:event])
-          # Header line.
-          svc_alias = config_var if service != md[:service]
-          cur = EventHandlerItem.new(
-            #name
-            local_path: path,
-            #id
-            script: line,
-            line: lineno,
-            #line_end
-            #diff
-            #selected
-            #synckey
-            #synctype
-            #type
-            #updated_at
-            #dup_count
-            #alias
-            #updated_at
-            #created_at
-            #solution_id
-            service: service,
-            event: event_event,
-            type: event_type,
-            #phantom
-            svc_alias: svc_alias,
-          )
+          cur[:line_end] = lineno - 1 unless cur.nil?
+          cur = to_remote_item_create(md, path, line, lineno)
+          items << cur
         elsif !cur.nil? && !cur[:script].nil?
           cur[:script] += line
         end
-        lineno += 1
+        # else, cur.nil?, or no :script (not used by item), so skip this line.
+      end
+
+      if !cur.nil?
+        cur[:line_end] = lineno
+      else
+        # If cur is nil here, then we need to do a :legacy check.
+        cur = to_remote_item_legacy_check(cur, path, from, lineno)
+        items << cur
       end
-      cur[:line_end] = lineno unless cur.nil?
 
-      # If cur is nil here, then we need to do a :legacy check.
-      to_remote_item_legacy_check(cur, path, from, lineno)
+      items
+    end
+
+    def to_remote_item_create(md, path, line, lineno)
+      service, config_var = decode_config_var(md[:service])
+      event_event, event_type = resolve_event_type(service, md[:event])
+      # Header line.
+      svc_alias = config_var if service != md[:service]
+      EventHandlerItem.new(
+        # Skip: name, id, line_end, diff, selected, synckey, synctype, type,
+        # updated_at, dup_count, alias, updted_at, created_at, solution_id, phantom.
+        local_path: path,
+        script: line,
+        line_beg: lineno,
+        service: service,
+        event: event_event,
+        type: event_type,
+        svc_alias: svc_alias,
+      )
     end
 
-    def to_remote_item_legacy_check(cur, path, from, lineno)
+    def to_remote_item_legacy_check(cur, path, from, line_end)
       return cur unless cur.nil? && $project['services.legacy'].is_a?(Hash)
       spath = path.relative_path_from(from)
       debug "No headers: #{spath}"
@@ -574,8 +601,8 @@ module MrMurano
           event: event,
           type: nil,
           local_path: path,
-          line: 0,
-          line_end: lineno,
+          line_beg: 1,
+          line_end: line_end,
           script: path.read, # FIXME: ick, fix this.
         )
       end
@@ -805,6 +832,7 @@ module MrMurano
   SyncRoot.instance.add(
     'services', EventHandlerSolnApp, 'S', true, %w[eventhandlers]
   )
+
   # 2017-08-08: device2 and interface are now part of the skiplist, so no
   # product event handlers will be found, unless the user modifies the skiplist.
   SyncRoot.instance.add(

data/lib/MrMurano/Solution-Users.rb

@@ -30,7 +30,7 @@ module MrMurano
       #   sort_by_name(ret)
     end
 
-    def fetch(id)
+    def fetch(id, _untainted=false)
       get('/' + id.to_s)
     end
 

data/lib/MrMurano/Solution.rb

@@ -62,59 +62,6 @@ module MrMurano
     end
     # …
 
-    def get(path='', query=nil, &block)
-      aggregate = nil
-      total = nil
-      remaining = -1
-      orig_query = (query || []).dup
-      while remaining != 0
-        ret = super
-        if ret.nil? && !@suppress_error
-          warning "No solution with ID: #{@api_id}"
-          whirly_interject { say 'Run `murano show` to see the business and list of solutions.' }
-          MrMurano::SolutionBase.warn_configfile_env_maybe
-          exit 1
-        end
-        return nil if ret.nil?
-        # Pagination: Check if more data.
-        if ret.is_a?(Hash) && ret.key?(:total) && ret.key?(:items)
-          query = orig_query.dup
-          if total.nil?
-            total = ret[:total]
-            remaining = total - ret[:items].length
-            # The response also includes a hint of how to get the next page.
-            #   ret[:next] == "/api/v1/eventhandler?query={\
-            #     \"solution_id\":\"XXXXXXXXXXXXXXXX\"}&limit=20&offset=20"
-            # But note that the URL we use is a little different
-            #   https://bizapi.hosted.exosite.io/api:1/solution/XXXXXXXXXXXXXXXXX/eventhandler
-          else
-            if total != ret[:total]
-              warning "Unexpected: subsequence :total not total: #{ret[:total]} != #{total}"
-            end
-            remaining -= ret[:items].length
-          end
-          if remaining > 0
-            #query.push ['limit', 20]
-            query.push ['offset', total - remaining]
-          elsif remaining != 0
-            warning "Unexpected: negative remaining: #{fancy_ticks(total)}"
-            remaining = 0
-          end
-          if aggregate.nil?
-            aggregate = ret
-          else
-            aggregate[:items].concat ret[:items]
-          end
-        else
-          # ret is not a hash, or it's missing :total or :items.
-          warning "Unexpected: aggregate set: #{aggregate} / ret: #{ret}" unless aggregate.nil?
-          aggregate = ret
-          remaining = 0
-        end
-      end
-      aggregate
-    end
-
     # This at least works for EventHandler and ServiceConfig.
     # - ServiceConfig overrides to fetch also 'script_key'.
     def search(svc_name, path=nil)
@@ -133,16 +80,6 @@ module MrMurano
       matches.select { |match| match[:service] == svc_name }
     end
 
-    def self.warn_configfile_env_maybe
-      if !$cfg.get('business.id', :env).to_s.empty? &&
-         !$cfg.get('business.id', :project).to_s.empty? &&
-         $cfg.get('business.id', :env) != $cfg.get('business.id', :project)
-        MrMurano::Verbose.warning(
-          'NOTE: MURANO_CONFIGFILE specifies a different business.id than the local project file'
-        )
-      end
-    end
-
     include SyncUpDown
   end
 
@@ -155,6 +92,8 @@ module MrMurano
       @meta = {}
       @valid = false
       self.meta = meta unless meta.nil?
+      @soln_services = nil
+      @soln_svc_cfgs = {}
     end
 
     # The Solution @name.
@@ -213,6 +152,17 @@ module MrMurano
       get('/logs')
     end
 
+    def service
+      return @soln_services unless @soln_services.nil?
+      @soln_services = get('/service')
+    end
+
+    # See also Solution-ServiceConfig.rb's ServiceBase, which calls same endpoint.
+    def serviceconfig(query=nil)
+      return @soln_svc_cfgs[query] unless @soln_svc_cfgs[query].nil?
+      @soln_svc_cfgs[query] = get('/serviceconfig', query)
+    end
+
     # *** Solution utils
 
     def cfg_key_id