openc3 5.5.0 → 5.5.1

data/lib/openc3/models/interface_model.rb

@@ -257,12 +257,15 @@ module OpenC3
         @log_raw = true
 
       when 'SECRET'
-        parser.verify_num_parameters(3, 4, "#{keyword} <Secret Type: ENV or FILE> <Secret Name> <Environment Variable Name or File Path> <Option Name (Optional)>")
+        parser.verify_num_parameters(3, 5, "#{keyword} <Secret Type: ENV or FILE> <Secret Name> <Environment Variable Name or File Path> <Option Name (Optional)> <Secret Store Name (Optional)>")
         @secrets << parameters[0..2]
-        if parameters[3]
+        if ConfigParser.handle_nil(parameters[3])
           # Option Name, Secret Name
           @secret_options << [parameters[3], parameters[1]]
         end
+        if ConfigParser.handle_nil(parameters[4])
+          @secrets[-1] << parameters[4]
+        end
 
       else
         raise ConfigParser::Error.new(parser, "Unknown keyword and parameters for Interface/Router: #{keyword} #{parameters.join(" ")}")

data/lib/openc3/models/microservice_model.rb

@@ -23,7 +23,6 @@
 require 'openc3/top_level'
 require 'openc3/models/model'
 require 'openc3/models/metric_model'
-require 'openc3/models/traefik_model'
 require 'openc3/utilities/bucket'
 
 module OpenC3
@@ -193,8 +192,12 @@ module OpenC3
         parser.verify_num_parameters(1, 1, "#{keyword} <Container Image Name>")
         @container = parameters[0]
       when 'SECRET'
-        parser.verify_num_parameters(3, 3, "#{keyword} <Secret Type: ENV or FILE> <Secret Name> <Environment Variable Name or File Path>")
-        @secrets << parameters.dup
+        parser.verify_num_parameters(3, 4, "#{keyword} <Secret Type: ENV or FILE> <Secret Name> <Environment Variable Name or File Path> <Secret Store Name (Optional)>")
+        if ConfigParser.handle_nil(parameters[3])
+          @secrets << parameters.dup
+        else
+          @secrets << parameters[0..2]
+        end
       when 'ROUTE_PREFIX'
         parser.verify_num_parameters(1, 1, "#{keyword} <Route Prefix>")
         @prefix = parameters[0]
@@ -225,7 +228,6 @@ module OpenC3
         end
       end
       unless validate_only
-        TraefikModel.register_route(microservice_name: @name, port: @ports[0][0], prefix: @prefix) if @ports[0] and ports[0][0] and @prefix
         ConfigTopic.write({ kind: 'created', type: 'microservice', name: @name, plugin: @plugin }, scope: @scope)
       end
     end
@@ -235,7 +237,6 @@ module OpenC3
       @bucket.list_objects(bucket: ENV['OPENC3_CONFIG_BUCKET'], prefix: prefix).each do |object|
         @bucket.delete_object(bucket: ENV['OPENC3_CONFIG_BUCKET'], key: object.key)
       end
-      TraefikModel.unregister_route(microservice_name: @name, port: @ports[0][0], prefix: @prefix) if @ports[0] and ports[0][0] and @prefix
       ConfigTopic.write({ kind: 'deleted', type: 'microservice', name: @name, plugin: @plugin }, scope: @scope)
     rescue Exception => error
       Logger.error("Error undeploying microservice model #{@name} in scope #{@scope} due to #{error}")

data/lib/openc3/models/plugin_model.rb

@@ -44,7 +44,7 @@ module OpenC3
   class PluginModel < Model
     PRIMARY_KEY = 'openc3_plugins'
     # Reserved VARIABLE names. See local_mode.rb: update_local_plugin()
-    RESERVED_VARIABLE_NAMES = ['target_name', 'microservice_name']
+    RESERVED_VARIABLE_NAMES = ['target_name', 'microservice_name', 'scope']
 
     attr_accessor :variables
     attr_accessor :plugin_txt_lines
@@ -198,6 +198,8 @@ module OpenC3
           tf.close
           plugin_txt_path = tf.path
           variables = plugin_hash['variables']
+          variables ||= {}
+          variables['scope'] = scope
           if File.exist?(plugin_txt_path)
             parser = OpenC3::ConfigParser.new("https://openc3.com")
 

data/lib/openc3/operators/microservice_operator.rb

@@ -60,8 +60,8 @@ module OpenC3
       # Setup secrets for microservice
       secrets = microservice_config["secrets"]
       if secrets
-        secrets.each do |type, secret_name, env_name_or_path|
-          secret_value = @secrets.get(secret_name, scope: scope)
+        secrets.each do |type, secret_name, env_name_or_path, secret_store|
+          secret_value = @secrets.get(secret_name, secret_store: secret_store, scope: scope)
           if secret_value
             case type
             when 'ENV'

data/lib/openc3/utilities/redis_secrets.rb

@@ -21,11 +21,11 @@ require 'openc3/utilities/secrets'
 
 module OpenC3
   class RedisSecrets < Secrets
-    def keys(scope:)
+    def keys(secret_store: nil, scope:)
       SecretModel.names(scope: scope)
     end
 
-    def get(key, scope:)
+    def get(key, secret_store: nil, scope:)
       data = SecretModel.get(name: key, scope: scope)
       if data
         return data['value']
@@ -34,11 +34,11 @@ module OpenC3
       end
     end
 
-    def set(key, value, scope:)
+    def set(key, value, secret_store: nil, scope:)
       SecretModel.set( {name: key, value: value.to_s }, scope: scope)
     end
 
-    def delete(key, scope:)
+    def delete(key, secret_store: nil, scope:)
       model = SecretModel.get_model(name: key, scope: scope)
       model.destroy if model
     end

data/lib/openc3/utilities/secrets.rb

@@ -31,24 +31,24 @@ module OpenC3
       klass.new
     end
 
-    def keys(scope:)
+    def keys(secret_store: nil, scope:)
       raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
     end
 
-    def get(key, scope:)
+    def get(key, secret_store: nil, scope:)
       return @local_secrets[key]
     end
 
-    def set(key, value, scope:)
+    def set(key, value, secret_store: nil, scope:)
       raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
     end
 
-    def delete(key, scope:)
+    def delete(key, secret_store: nil, scope:)
       raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
     end
 
     def setup(secrets)
-      secrets.each do |type, key, data|
+      secrets.each do |type, key, data, secret_store|
         case type
         when 'ENV'
           @local_secrets[key] = ENV[data]

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.5.0'
+OPENC3_VERSION = '5.5.1'
 module OpenC3
   module Version
     MAJOR = '5'
     MINOR = '5'
-    PATCH = '0'
+    PATCH = '1'
     OTHER = ''
-    BUILD = '6e9e3efe6170bd7adca14b849620f03fb622338d'
+    BUILD = 'a1e84e1850e06f2c01726e03372e2872137b3852'
   end
-  VERSION = '5.5.0'
-  GEM_VERSION = '5.5.0'
+  VERSION = '5.5.1'
+  GEM_VERSION = '5.5.1'
 end

data/templates/target/targets/TARGET/screens/status.txt

@@ -2,8 +2,7 @@ SCREEN AUTO AUTO 1.0
 
 TITLE "Status"
 
-VERTICALBOX
-  SECTIONHEADER "Information"
+VERTICALBOX "Information"
   LABELVALUE <%= target_name %> STATUS VALUE
   LABELVALUE <%= target_name %> STATUS BOOL
 END

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.5.1
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -692,6 +692,8 @@ files:
 - bin/openc3cli
 - bin/rubysloc
 - data/config/_array_params.yaml
+- data/config/_canvas_values.yaml
+- data/config/_graph_params.yaml
 - data/config/_id_items.yaml
 - data/config/_id_params.yaml
 - data/config/_interfaces.yaml
@@ -700,6 +702,7 @@ files:
 - data/config/command.yaml
 - data/config/command_modifiers.yaml
 - data/config/command_telemetry.yaml
+- data/config/graph_settings.yaml
 - data/config/interface_modifiers.yaml
 - data/config/item_modifiers.yaml
 - data/config/microservice.yaml
@@ -708,6 +711,7 @@ files:
 - data/config/plugins.yaml
 - data/config/protocols.yaml
 - data/config/screen.yaml
+- data/config/settings.yaml
 - data/config/table_manager.yaml
 - data/config/table_parameter_modifiers.yaml
 - data/config/target.yaml
@@ -899,7 +903,6 @@ files:
 - lib/openc3/models/timeline_model.rb
 - lib/openc3/models/tool_config_model.rb
 - lib/openc3/models/tool_model.rb
-- lib/openc3/models/traefik_model.rb
 - lib/openc3/models/trigger_group_model.rb
 - lib/openc3/models/trigger_model.rb
 - lib/openc3/models/widget_model.rb

data/lib/openc3/models/traefik_model.rb

@@ -1,47 +0,0 @@
-# encoding: ascii-8bit
-
-# Copyright 2023 OpenC3, Inc.
-# All Rights Reserved.
-#
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# This file may also be used under the terms of a commercial license
-# if purchased from OpenC3, Inc.
-
-require 'openc3/utilities/store'
-
-module OpenC3
-  class TraefikModel
-    def self.register_route(microservice_name:, port:, prefix:, priority: 20)
-      prefix = '/' + prefix unless prefix[0] == '/'
-      if ENV['KUBERNETES_SERVICE_HOST']
-        url = "http://#{microservice_name.gsub('__', '-')}:#{port}"
-      else
-        url = "http://openc3-operator:#{port}"
-      end
-      service_name = microservice_name
-      router_name = microservice_name
-      Store.set("traefik/http/services/#{service_name}/loadbalancer/servers/0/url", url)
-      Store.set("traefik/http/routers/#{router_name}/service", service_name)
-      Store.set("traefik/http/routers/#{router_name}/priority", priority)
-      Store.set("traefik/http/routers/#{router_name}/rule", "PathPrefix(`#{prefix}`)")
-    end
-
-    def self.unregister_route(microservice_name:)
-      service_name = microservice_name
-      router_name = microservice_name
-      Store.del("traefik/http/routers/#{router_name}/rule")
-      Store.del("traefik/http/routers/#{router_name}/priority")
-      Store.del("traefik/http/routers/#{router_name}/service")
-      Store.del("traefik/http/services/#{service_name}/loadbalancer/servers/0/url")
-    end
-  end
-end