openc3 5.0.6 → 5.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e697341ab4bde4e1e328f09cbddd864c876b3abe9fcf733310d54da6db94eeb1
-  data.tar.gz: 0bbb0a7f995179dafaacaca3e4200d9be15999d17450332e250941bdaab8d31d
+  metadata.gz: 19c4ca95f60633de6f38b56a72891bda7cdcdf0b902a16d52f6527966c213bab
+  data.tar.gz: 7ed07cc0014bd9ca27c57ff307cc879e385617339a6cb9b6c1fa891ab971a018
 SHA512:
-  metadata.gz: 0c80dc72a7cddced1220dd8092794a5d795d2a169e6112afef6a0a22292b8efe6b97db7ab5894ef6fd5d638afa949f5d27c9f93a279e2761692af11ea047fd8f
-  data.tar.gz: 4b9a87364b61120819992fde6ec36afe3fad6b13ae19f23945c39abfbbfe475c24bba93966c9edb6b4234e3a0c526506580e582bf324e7f3320dd7f24c5b75b5
+  metadata.gz: bc5c9ff0457266a17d4bef4f89c40fc99b851d4fe87d1d40783db3bdd84bf2581244e0055bfd6c5db706a60f35f4073d3eb0f9c0659a88a736bdc185051535bc
+  data.tar.gz: fdc7c1552371c0555f0d67e30d8f31b9e966986224ecec2ab0c5705e60f8f2d4708782fb26776d359514c696ea6632f380526f7ba7a6dc34d382d32eab3f536b

data/bin/openc3cli

@@ -521,6 +521,30 @@ if not ARGV[0].nil? # argument(s) given
       puts "Valid redis tasks: keys, hget"
     end
 
+  when 'removebase'
+    # Used to remove tool base to better support enterprise upgrade
+    scopes = OpenC3::ScopeModel.all
+    scopes.each do |scope_name, scope|
+      plugins = OpenC3::PluginModel.all(scope: scope_name)
+      plugins.each do |plugin_name, plugin|
+        if plugin["name"] =~ /tool-base/ and plugin["name"] !~ /enterprise/
+          unload_plugin(plugin_name, scope: scope_name)
+        end
+      end
+    end
+
+  when 'removeenterprise'
+    # Used to remove enterprise plugins to better support downgrade
+    scopes = OpenC3::ScopeModel.all
+    scopes.each do |scope_name, scope|
+      plugins = OpenC3::PluginModel.all(scope: scope_name)
+      plugins.each do |plugin_name, plugin|
+        if plugin["name"] =~ /enterprise/
+          unload_plugin(plugin_name, scope: scope_name)
+        end
+      end
+    end
+
   else # Unknown task
     print_usage()
     abort("Unknown task: #{ARGV[0]}")

data/lib/openc3/models/process_status_model.rb

@@ -40,7 +40,9 @@ module OpenC3
     end
 
     def self.all(scope:)
-      super("#{scope}__#{PRIMARY_KEY}")
+      all = super("#{scope}__#{PRIMARY_KEY}")
+      # Sort by the time and reverse to put newest (latest timestamp) on top
+      all.sort_by { |key, value| value['updated_at'] }.reverse
     end
     # END NOTE
 

data/lib/openc3/models/target_model.rb

@@ -82,13 +82,133 @@ module OpenC3
       super("#{scope}__#{PRIMARY_KEY}")
     end
 
+    # All targets with indication of modified targets
+    def self.all_modified(scope:)
+      targets = self.all(scope: scope)
+      targets.each { |target_name, target| target['modified'] = false }
+
+      rubys3_client = Aws::S3::Client.new
+      token = nil
+      while true
+        resp = rubys3_client.list_objects_v2({
+          bucket: 'config',
+          max_keys: 1000,
+          # The trailing slash is important!
+          prefix: "#{scope}/targets_modified/",
+          delimiter: '/',
+          continuation_token: token
+        })
+        resp.common_prefixes.each do |item|
+          # Results look like DEFAULT/targets_modified/INST/
+          # so split on '/' and pull out the last value
+          target_name = item.prefix.split('/')[-1]
+          # A target could have been deleted without removing the modified files
+          # Thus we have to check for the existance of the target_name key
+          if targets.has_key?(target_name)
+            targets[target_name]['modified'] = true
+          end
+        end
+        break unless resp.is_truncated
+        token = resp.next_continuation_token
+      end
+      # Sort (which turns hash to array) and return hash
+      # This enables a consistent listing of the targets
+      targets.sort.to_h
+    end
+
+    # Given target's modified file list
+    def self.modified_files(name, scope:)
+      modified = []
+      rubys3_client = Aws::S3::Client.new
+      token = nil
+      while true
+        resp = rubys3_client.list_objects_v2({
+          bucket: 'config',
+          max_keys: 1000,
+          # The trailing slash is important!
+          prefix: "#{scope}/targets_modified/#{name}/",
+          continuation_token: token
+        })
+        resp.contents.each do |item|
+          # Results look like DEFAULT/targets_modified/INST/procedures/new.rb
+          # so split on '/' and ignore the first two values
+          modified << item.key.split('/')[2..-1].join('/')
+        end
+        break unless resp.is_truncated
+        token = resp.next_continuation_token
+      end
+      # Sort to enable a consistent listing of the modified files
+      modified.sort
+    end
+
+    def self.delete_modified(name, scope:)
+      rubys3_client = Aws::S3::Client.new
+      token = nil
+      while true
+        resp = rubys3_client.list_objects_v2({
+          bucket: 'config',
+          max_keys: 1000,
+          # The trailing slash is important!
+          prefix: "#{scope}/targets_modified/#{name}/",
+          continuation_token: token
+        })
+        resp.contents.each do |item|
+          rubys3_client.delete_object(bucket: 'config', key: item.key)
+        end
+        break unless resp.is_truncated
+        token = resp.next_continuation_token
+      end
+      # rubys3_client = Aws::S3::Client.new
+      # prefix = "#{scope}/targets_modified/#{name}/"
+      # rubys3_client.list_objects(bucket: 'config', prefix: prefix).contents.each do |object|
+      #   rubys3_client.delete_object(bucket: 'config', key: object.key)
+      # end
+    end
+
+    def self.download(name, scope:)
+      tmp_dir = Dir.mktmpdir
+      zip_filename = File.join(tmp_dir, "#{name}.zip")
+      Zip.continue_on_exists_proc = true
+      zip = Zip::File.open(zip_filename, Zip::File::CREATE)
+
+      rubys3_client = Aws::S3::Client.new
+      token = nil
+      # The trailing slash is important!
+      prefix = "#{scope}/targets_modified/#{name}/"
+      while true
+        resp = rubys3_client.list_objects_v2({
+          bucket: 'config',
+          max_keys: 1000,
+          prefix: prefix,
+          continuation_token: token
+        })
+        resp.contents.each do |item|
+          # item.key looks like DEFAULT/targets_modified/INST/screens/blah.txt
+          base_path = item.key.sub(prefix, '') # remove prefix
+          local_path = File.join(tmp_dir, base_path)
+          # Ensure dir structure exists, get_object fails if not
+          FileUtils.mkdir_p(File.dirname(local_path))
+          rubys3_client.get_object(bucket: 'config', key: item.key, response_target: local_path)
+          zip.add(base_path, local_path)
+        end
+        break unless resp.is_truncated
+        token = resp.next_continuation_token
+      end
+      zip.close
+
+      result = OpenStruct.new
+      result.filename = File.basename(zip_filename)
+      result.contents = File.read(zip_filename, mode: 'rb')
+      return result
+    end
+
     # @return [Array] Array of all the packet names
     def self.packet_names(target_name, type: :TLM, scope:)
       raise "Unknown type #{type} for #{target_name}" unless VALID_TYPES.include?(type)
       # If the key doesn't exist or if there are no packets we return empty array
       Store.hkeys("#{scope}__openc3#{type.to_s.downcase}__#{target_name}").sort
     end
-  
+
     # @return [Hash] Packet hash or raises an exception
     def self.packet(target_name, packet_name, type: :TLM, scope:)
       raise "Unknown type #{type} for #{target_name} #{packet_name}" unless VALID_TYPES.include?(type)
@@ -420,9 +540,6 @@ module OpenC3
     end
 
     def undeploy
-      # Note: The plugin_model undeploy method removes all the microservices first
-      # so we don't need to destroy them here
-
       rubys3_client = Aws::S3::Client.new
       prefix = "#{@scope}/targets/#{@name}/"
       rubys3_client.list_objects(bucket: 'config', prefix: prefix).contents.each do |object|

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.0.6'
+OPENC3_VERSION = '5.0.7'
 module OpenC3
   module Version
     MAJOR = '5'
     MINOR = '0'
-    PATCH = '6'
+    PATCH = '7'
     OTHER = ''
-    BUILD = 'a855874ec4d38adb28e024dd53f9094b9d0c4574'
+    BUILD = 'be957bd6e3c30c2e535b9ee8dfbeffe75c720874'
   end
-  VERSION = '5.0.6'
-  GEM_VERSION = '5.0.6'
+  VERSION = '5.0.7'
+  GEM_VERSION = '5.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 5.0.7
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler