cosmos 5.0.2 → 5.0.5

data/lib/cosmos/script/storage.rb

@@ -23,137 +23,124 @@ module Cosmos
   module Script
     private
 
-    # Get a handle to access a target file
+    # Delete a file on a target
+    #
+    # @param [String] Path to a file in a target directory
+    def delete_target_file(path, scope: $cosmos_scope)
+      begin
+        # Only delete from the targets_modified
+        delete_path = "#{scope}/targets_modified/#{path}"
+        endpoint = "/cosmos-api/storage/delete/#{delete_path}"
+        Cosmos::Logger.info "Deleting #{delete_path}"
+        response = $api_server.request('delete', endpoint, query: {bucket: 'config'})
+        if response.nil? || response.code != 200
+          raise "Failed to delete #{delete_path}. Note: #{scope}/targets is read-only."
+        end
+      rescue => error
+        raise "Failed deleting #{path} due to #{error.message}"
+      end
+      nil
+    end
+
+    # Get a handle to write a target file
     #
     # @param path [String] Path to a file in a target directory
-    # @param original [Boolean] Whether to get the original or modified file
-    # @return [File|nil]
-    def get_target_file(path, original: false, scope: $cosmos_scope)
-      # Create Tempfile to store data
-      file = Tempfile.new('target', binmode: true)
+    # @param io_or_string [Io or String] IO object
+    def put_target_file(path, io_or_string, scope: $cosmos_scope)
+      raise "Disallowed path modifier '..' found in #{path}" if path.include?('..')
+      upload_path = "#{scope}/targets_modified/#{path}"
+      endpoint = "/cosmos-api/storage/upload/#{upload_path}"
+      Cosmos::Logger.info "Writing #{upload_path}"
+      result = _get_presigned_request(endpoint)
 
-      # Get presigned url
-      if original
-        part = "targets"
-      else
-        part = "targets_modified"
-      end
-      # Loop to allow redo
-      loop do
-        endpoint = "/cosmos-api/storage/download/#{scope}/#{part}/#{path}"
-        Cosmos::Logger.info "Reading #{scope}/#{part}/#{path}"
-        if $cosmos_in_cluster
-          response = $api_server.request('get', endpoint, query: {bucket: 'config', internal: true})
-        else
-          response = $api_server.request('get', endpoint, query: {bucket: 'config'})
-        end
-        if response.nil? || response.code != 201
-          Cosmos::Logger.error "Failed Get Presigned URL for #{scope}/#{part}/#{path}"
-          if part == "targets_modified"
-            part = "targets"
-            redo
+      # Try to put the file
+      success = false
+      begin
+        uri = _get_uri(result['url'])
+        Net::HTTP.start(uri.host, uri.port) do |http|
+          request = Net::HTTP::Put.new(uri, {'Content-Length' => io_or_string.length.to_s})
+          if String === io_or_string
+            request.body = io_or_string
           else
-            raise "#{path} not found"
+            request.body_stream = io_or_string
+          end
+          result = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
+            http.request(request)
           end
+          return result
         end
-        result = JSON.parse(response.body)
+      rescue => error
+        raise "Failed to write #{upload_path}"
+      end
+      nil
+    end
 
-        # Try to get the file
+    # Get a handle to access a target file
+    #
+    # @param path [String] Path to a file in a target directory, e.g. "INST/procedures/test.rb"
+    # @param original [Boolean] Whether to get the original or modified file
+    # @return [File|nil]
+    def get_target_file(path, original: false, scope: $cosmos_scope)
+      part = "targets"
+      part += "_modified" unless original
+      # Loop to allow redo when switching from modified to original
+      loop do
         begin
-          if $cosmos_in_cluster
-            uri = URI.parse("http://cosmos-minio:9000" + result['url'])
-          else
-            uri = URI.parse($api_server.generate_url + result['url'])
-          end
-          Net::HTTP.start(uri.host, uri.port) do |http|
-            request = Net::HTTP::Get.new uri
-
-            http.request request do |response|
-              response.read_body do |chunk|
-                puts chunk.length
-                file.write chunk
-              end
-            end
-            file.rewind
-          end
-          return file
+          return _get_storage_file("#{part}/#{path}", scope: scope)
         rescue => error
-          Cosmos::Logger.info("#{scope}/#{part}/#{path} not found")
           if part == "targets_modified"
             part = "targets"
             redo
           else
-            raise "#{path} not found"
+            raise error
           end
         end
         break
       end
     end
 
-    # Get a handle to write a target file
-    #
-    # @param path [String] Path to a file in a target directory
-    # @param io_or_string [Io or String] IO object
-    def put_target_file(path, io_or_string, scope: $cosmos_scope)
-      # Get presigned url
-      part = "targets_modified"
-      begin
-        endpoint = "/cosmos-api/storage/upload/#{scope}/#{part}/#{path}"
-        Cosmos::Logger.info "Writing #{scope}/#{part}/#{path}"
-        if $cosmos_in_cluster
-          response = $api_server.request('get', endpoint, query: {bucket: 'config', internal: true})
-        else
-          response = $api_server.request('get', endpoint, query: {bucket: 'config'})
-        end
-        if response.nil? || response.code != 201
-          Cosmos::Logger.error "Failed Get Presigned URL for #{scope}/#{part}/#{path}"
-          return nil
-        end
-        result = JSON.parse(response.body)
+    # These are helper methods ... should not be used directly
 
-        # Try to put the file
-        success = false
-        begin
-          if $cosmos_in_cluster
-            uri = URI.parse("http://cosmos-minio:9000" + result['url'])
-          else
-            uri = URI.parse($api_server.generate_url + result['url'])
-          end
-          Net::HTTP.start(uri.host, uri.port) do |http|
-            request = Net::HTTP::Put.new(uri, {'Content-Length' => io_or_string.length.to_s})
-            if String === io_or_string
-              request.body = io_or_string
-            else
-              request.body_stream = io_or_string
-            end
-            result = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
-              http.request(request)
-            end
-            return result
+    def _get_storage_file(path, scope: $cosmos_scope)
+      # Create Tempfile to store data
+      file = Tempfile.new('target', binmode: true)
+
+      endpoint = "/cosmos-api/storage/download/#{scope}/#{path}"
+      Cosmos::Logger.info "Reading #{scope}/#{path}"
+      result = _get_presigned_request(endpoint)
+
+      # Try to get the file
+      uri = _get_uri(result['url'])
+      Net::HTTP.start(uri.host, uri.port) do |http|
+        request = Net::HTTP::Get.new uri
+        http.request request do |response|
+          response.read_body do |chunk|
+            file.write chunk
           end
-        rescue => error
-          raise "Failed to write #{scope}/#{part}/#{path}"
         end
+        file.rewind
       end
-      nil
+      return file
     end
 
-    # Delete a file on a target
-    #
-    # @param [String] Path to a file in a target directory
-    def delete_target_file(path, scope: $cosmos_scope)
-      begin
-        # Only delete from the targets_modified
-        endpoint = "/cosmos-api/storage/delete/#{scope}/targets_modified/#{path}"
-        Cosmos::Logger.info "Deleting #{scope}/targets_modified/#{path}"
-        response = $api_server.request('delete', endpoint, query: {bucket: 'config'})
-        if response.nil? || response.code != 200
-          raise "Failed to delete #{scope}/targets_modified/#{path}"
-        end
-      rescue => error
-        raise "Failed deleting #{path} due to #{error.message}"
+    def _get_uri(url)
+      if $cosmos_in_cluster
+        uri = URI.parse("http://cosmos-minio:9000" + url)
+      else
+        uri = URI.parse($api_server.generate_url + url)
       end
-      nil
+    end
+
+    def _get_presigned_request(endpoint)
+      if $cosmos_in_cluster
+        response = $api_server.request('get', endpoint, query: { bucket: 'config', internal: true })
+      else
+        response = $api_server.request('get', endpoint, query: { bucket: 'config' })
+      end
+      if response.nil? || response.code != 201
+        raise "Failed to get presigned URL for #{endpoint}"
+      end
+      JSON.parse(response.body)
     end
   end
 end

data/lib/cosmos/system/system.rb

@@ -26,6 +26,7 @@ require 'cosmos/packets/limits'
 require 'cosmos/system/target'
 require 'cosmos/utilities/s3'
 require 'cosmos/utilities/zip'
+require 'cosmos/models/scope_model'
 require 'thread'
 require 'fileutils'
 
@@ -54,7 +55,7 @@ module Cosmos
 
     # @return [Symbol] The current limits_set of the system returned from Redis
     def self.limits_set
-      Store.hget("#{$cosmos_scope}__cosmos_system", 'limits_set').intern
+      ScopeModel.limits_set(scope: $cosmos_scope)
     end
 
     def self.setup_targets(target_names, base_dir, scope:)

data/lib/cosmos/tools/table_manager/table_config.rb

@@ -32,12 +32,19 @@ module Cosmos
     # @return [String] Table configuration filename
     attr_reader :filename
 
+    def self.process_file(filename)
+      instance = self.new()
+      instance.process_file(filename)
+      instance
+    end
+
     # Create the table configuration
     def initialize
       super
-
       # Override commands with the Table::TARGET name to store tables
       @commands[Table::TARGET] = {}
+      @definitions = {}
+      @last_config = [] # Stores array of [filename, contents]
     end
 
     # @return [Array<Table>] All tables defined in the configuration file
@@ -45,6 +52,11 @@ module Cosmos
       @commands[Table::TARGET]
     end
 
+    # @return [String] Table definition for the specific table
+    def definition(table_name)
+      @definitions[table_name.upcase]
+    end
+
     # @return [Array<String>] All the table names
     def table_names
       tables.keys
@@ -64,6 +76,7 @@ module Cosmos
       # Partial files are included into another file and thus aren't directly processed
       return if File.basename(filename)[0] == '_' # Partials start with underscore
       @filename = filename
+      @last_config = [File.basename(filename), File.read(filename)]
       @converted_type = nil
       @converted_bit_size = nil
       @proc_text = ''
@@ -111,10 +124,12 @@ module Cosmos
                     )
             end
             process_file(table_filename)
+
           when 'TABLE'
             finish_packet
             @current_packet =
               TableParser.parse_table(parser, @commands, @warnings)
+            @definitions[@current_packet.packet_name] = @last_config
             @current_cmd_or_tlm = COMMAND
             @default_index = 0
 

data/lib/cosmos/tools/table_manager/table_item.rb

@@ -80,7 +80,7 @@ module Cosmos
     alias dup clone
 
     # Create a hash of this item's attributes
-    def to_hash
+    def as_json
       hash = super()
       hash['editable'] = self.editable
       hash['hidden'] = self.hidden