ruby-grafana-reporter 0.2.2 → 0.3.0

data/lib/grafana_reporter/application/webservice.rb

@@ -160,12 +160,11 @@ module GrafanaReporter
 
         # provide report
         @logger.debug("Returning PDF report at #{report.path}")
-        content = File.read(report.path)
+        content = File.read(report.path, mode: 'rb')
         return http_response(200, 'OK', content, "Content-Type": 'application/pdf') if content.start_with?('%PDF')
 
-        # TODO: properly provide file as zip
         http_response(200, 'OK', content, "Content-Type": 'application/octet-stream',
-                                          "Content-Disposition": 'attachment; filename=report.zip')
+                                          "Content-Disposition": "attachment; filename=report_#{attrs['report_id']}.zip")
       end
 
       def render_report(attrs)

data/lib/grafana_reporter/asciidoctor/alerts_table_query.rb

@@ -46,8 +46,10 @@ module GrafanaReporter
       def pre_process(_grafana)
         raise MissingMandatoryAttributeError, 'columns' unless @variables['columns']
 
-        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] || @variables['grafana_default_from_timezone'])
-        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] || @variables['grafana_default_to_timezone'])
+        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] ||
+                               @variables['grafana_default_from_timezone'])
+        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] ||
+                             @variables['grafana_default_to_timezone'])
       end
 
       # Filter the query result for the given columns and sets the result in the preformatted SQL
@@ -73,11 +75,6 @@ module GrafanaReporter
         result = format_columns(result, @variables['format'])
         result = replace_values(result, @variables.select { |k, _v| k =~ /^replace_values_\d+/ })
         result = filter_columns(result, @variables['filter_columns'])
-        if @variables['filter_column']
-          @report.logger.warn("DEPRECATED: Call of  no longer supported function 'filter_column' has been found."\
-                              " Rename to 'filter_columns'")
-          result = filter_columns(result, @variables['filter_column'])
-        end
 
         @result = result[:content].map { |row| "| #{row.map { |item| item.to_s.gsub('|', '\\|') }.join(' | ')}" }
       end

data/lib/grafana_reporter/asciidoctor/annotations_table_query.rb

@@ -43,8 +43,10 @@ module GrafanaReporter
       def pre_process(_grafana)
         raise MissingMandatoryAttributeError, 'columns' unless @variables['columns']
 
-        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] || @variables['grafana_default_from_timezone'])
-        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] || @variables['grafana_default_to_timezone'])
+        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] ||
+                               @variables['grafana_default_from_timezone'])
+        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] ||
+                             @variables['grafana_default_to_timezone'])
       end
 
       # Filters the query result for the given columns and sets the result
@@ -70,11 +72,6 @@ module GrafanaReporter
         result = format_columns(result, @variables['format'])
         result = replace_values(result, @variables.select { |k, _v| k =~ /^replace_values_\d+/ })
         result = filter_columns(result, @variables['filter_columns'])
-        if @variables['filter_column']
-          @report.logger.warn("DEPRECATED: Call of  no longer supported function 'filter_column' has been found."\
-                              " Rename to 'filter_columns'")
-          result = filter_columns(result, @variables['filter_column'])
-        end
 
         @result = result[:content].map { |row| "| #{row.map { |item| item.to_s.gsub('|', '\\|') }.join(' | ')}" }
       end

data/lib/grafana_reporter/asciidoctor/extensions/annotations_table_include_processor.rb

@@ -70,7 +70,7 @@ module GrafanaReporter
           selected_attrs = attrs.select do |k, _v|
             k =~ /(?:columns|limit|alertId|dashboardId|panelId|userId|type|tags)/
           end
-          query.merge_variables(selected_attrs.each_with_object({}) { |(k,v), h| h[k] = ::Grafana::Variable.new(v) })
+          query.merge_variables(selected_attrs.each_with_object({}) { |(k, v), h| h[k] = ::Grafana::Variable.new(v) })
           @report.logger.debug("from: #{query.from}, to: #{query.to}")
 
           begin

data/lib/grafana_reporter/asciidoctor/extensions/value_as_variable_include_processor.rb

@@ -31,7 +31,7 @@ module GrafanaReporter
       # +call+ - regular call to the reporter hook (*mandatory*)
       #
       # +variable_name+ - name of the variable, to which the result shall be assigned (*mandatory*)
-     class ValueAsVariableIncludeProcessor < ::Asciidoctor::Extensions::IncludeProcessor
+      class ValueAsVariableIncludeProcessor < ::Asciidoctor::Extensions::IncludeProcessor
         include ProcessorMixin
 
         # :nodoc:
@@ -52,7 +52,8 @@ module GrafanaReporter
           @report.logger.debug("Processing ValueAsVariableIncludeProcessor (call: #{call}, target: #{target},"\
                                " variable_name: #{attribute}, attrs: #{attrs})")
           if !call || !attribute
-            @report.logger.error("Missing mandatory attribute 'call' or 'variable_name'.")
+            @report.logger.error('ValueAsVariableIncludeProcessor: Missing mandatory attribute \'call\' or '\
+                                 '\'variable_name\'.')
             return reader
           end
 
@@ -64,7 +65,8 @@ module GrafanaReporter
           # TODO: properly show error messages also in document
           ext = doc.extensions.find_inline_macro_extension(call) if doc.extensions.inline_macros?
           if !ext
-            @report.logger.error("Could not find inline macro extension for '#{call}'.")
+            @report.logger.error('ValueAsVariableIncludeProcessor: Could not find inline macro extension for '\
+                                 "'#{call}'.")
           else
             @report.logger.debug('ValueAsVariableIncludeProcessor: Calling sub-method.')
             item = ext.process_method.call(doc, target, attrs)
@@ -73,7 +75,7 @@ module GrafanaReporter
               @report.logger.debug("ValueAsVariableIncludeProcessor: Adding '#{result}' to document.")
               reader.unshift_line(result)
             else
-              @report.logger.debug("ValueAsVariableIncludeProcessor: Not adding variable '#{attribute}',"\
+              @report.logger.debug("ValueAsVariableIncludeProcessor: Not adding variable '#{attribute}'"\
                                    ' as query result was empty.')
             end
           end

data/lib/grafana_reporter/asciidoctor/help.rb

@@ -30,17 +30,17 @@ module GrafanaReporter
 #{functions_as_text(opts.merge(level: opts[:level] + 1))})
       end
 
-      def toc(opts = {})
+      def toc
         result = []
 
         result << "Table of contents"
         result << "* [Global options](#global-options)"
-        prepared_help[:global_options].sort.map do |k, v|
+        prepared_help[:global_options].sort.map do |k, _v|
           result << "  * [#{k}](##{k.downcase})"
         end
 
         result << "* [Functions](#functions)"
-        prepared_help[:functions].sort.map do |k, v|
+        prepared_help[:functions].sort.map do |k, _v|
           result << "  * [#{k}](##{k.downcase})"
         end
 
@@ -122,7 +122,7 @@ end}
       end
 
       def raw_help_yaml
-        return <<YAML_HELP
+        <<YAML_HELP
 global_options:
   grafana_default_instance:
     call: ":grafana_default_instance: <instance_name>"

data/lib/grafana_reporter/asciidoctor/panel_first_value_query.rb

@@ -26,8 +26,10 @@ module GrafanaReporter
         @datasource = @panel.field('datasource')
         @datasource_id = grafana.datasource_id(@datasource)
         super(grafana)
-        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] || @variables['grafana_default_from_timezone'])
-        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] || @variables['grafana_default_to_timezone'])
+        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] ||
+                               @variables['grafana_default_from_timezone'])
+        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] ||
+                             @variables['grafana_default_to_timezone'])
       end
     end
   end

data/lib/grafana_reporter/asciidoctor/panel_image_query.rb

@@ -9,11 +9,13 @@ module GrafanaReporter
       # Sets the proper render variables.
       def pre_process(grafana)
         super
-        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] || @variables['grafana_default_from_timezone'])
-        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] || @variables['grafana_default_to_timezone'])
-# TODO: ensure that in case of timezones are specified, that they are also forwarded to the image renderer as URL parameter
+        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] ||
+                               @variables['grafana_default_from_timezone'])
+        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] ||
+                             @variables['grafana_default_to_timezone'])
+        # TODO: ensure that in case of timezones are specified, that they are also forwarded to the image renderer
         # rename "render-" variables
-        @variables = @variables.each_with_object({}) { |(k,v), h| h[k.gsub(/^render-/, '')] = v }
+        @variables = @variables.each_with_object({}) { |(k, v), h| h[k.gsub(/^render-/, '')] = v }
       end
 
       # Returns the body of the http query, which contains the raw image.

data/lib/grafana_reporter/asciidoctor/panel_table_query.rb

@@ -30,8 +30,10 @@ module GrafanaReporter
         @datasource = @panel.field('datasource')
         @datasource_id = grafana.datasource_id(@datasource)
         super(grafana)
-        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] || @variables['grafana_default_from_timezone'])
-        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] || @variables['grafana_default_to_timezone'])
+        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] ||
+                               @variables['grafana_default_from_timezone'])
+        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] ||
+                             @variables['grafana_default_to_timezone'])
       end
     end
   end

data/lib/grafana_reporter/asciidoctor/query_mixin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GrafanaReporter
   module Asciidoctor
     # This mixin contains several common methods, which can be used within the queries.
@@ -8,8 +10,17 @@ module GrafanaReporter
       # @param item_hash [Hash] variables from item configuration level, i.e. specific call, which may override document
       # @return [void]
       def merge_hash_variables(document_hash, item_hash)
-        merge_variables(document_hash.select { |k, _v| k =~ /^var-/ || k == 'grafana-report-timestamp' || k =~ /grafana_default_(?:from|to)_timezone/ }.each_with_object({}) { |(k,v), h| h[k] = ::Grafana::Variable.new(v) })
-        merge_variables(item_hash.select { |k, _v| k =~ /^var-/ || k =~ /^render-/ || k =~ /filter_columns|format|replace_values_.*|transpose|column_divider|row_divider|from_timezone|to_timezone/ }.each_with_object({}) { |(k,v), h| h[k] = ::Grafana::Variable.new(v) })
+        sel_doc_items = document_hash.select do |k, _v|
+          k =~ /^var-/ || k == 'grafana-report-timestamp' || k =~ /grafana_default_(?:from|to)_timezone/
+        end
+        merge_variables(sel_doc_items.each_with_object({}) { |(k, v), h| h[k] = ::Grafana::Variable.new(v) })
+
+        sel_items = item_hash.select do |k, _v|
+          k =~ /^var-/ || k =~ /^render-/ || k =~ /filter_columns|format|replace_values_.*|transpose|column_divider|
+                                                   row_divider|from_timezone|to_timezone/x
+        end
+        merge_variables(sel_items.each_with_object({}) { |(k, v), h| h[k] = ::Grafana::Variable.new(v) })
+
         self.timeout = item_hash['timeout'] || document_hash['grafana-default-timeout'] || timeout
         self.from = item_hash['from'] || document_hash['from'] || from
         self.to = item_hash['to'] || document_hash['to'] || to
@@ -227,7 +238,7 @@ module GrafanaReporter
       #   calculated for +from+
       # @param timezone [Grafana::Variable] timezone to use, if not system timezone
       # @return [String] translated date as timestamp string
-      def translate_date(orig_date, report_time, is_to_time, timezone=nil)
+      def translate_date(orig_date, report_time, is_to_time, timezone = nil)
         report_time ||= Variable.new(Time.now.to_s)
         return (DateTime.parse(report_time.raw_value).to_time.to_i * 1000).to_s unless orig_date
         return orig_date if orig_date =~ /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/
@@ -238,7 +249,7 @@ module GrafanaReporter
         raise TimeRangeUnknownError, orig_date unless date_splitted
 
         date = DateTime.parse(report_time.raw_value)
-# TODO: allow from_translated or similar in ADOC template
+        # TODO: allow from_translated or similar in ADOC template
         date = date.new_offset(timezone.raw_value) if timezone
 
         # substract specified time

data/lib/grafana_reporter/asciidoctor/report.rb

@@ -115,8 +115,7 @@ module GrafanaReporter
         unless @grafana_instances[instance]
           @grafana_instances[instance] = ::Grafana::Grafana.new(@config.grafana_host(instance),
                                                                 @config.grafana_api_key(instance),
-                                                                logger: @logger,
-                                                                datasources: @config.grafana_datasources(instance))
+                                                                logger: @logger, ssl_cert: @config.ssl_cert)
         end
         @grafana_instances[instance]
       end

data/lib/grafana_reporter/asciidoctor/sql_first_value_query.rb

@@ -19,13 +19,11 @@ module GrafanaReporter
         results = replace_values(results, @variables.select { |k, _v| k =~ /^replace_values_\d+/ })
         results = filter_columns(results, @variables['filter_columns'])
 
-        unless results[:content].empty?
-          unless results[:content][0].empty?
-            @result = results[:content][0][0]
-            return
-          end
-        end
         @result = ''
+        return if results[:content].empty?
+        return if results[:content][0].empty?
+
+        @result = results[:content][0][0]
       end
 
       # Translates the from and to times.
@@ -34,8 +32,10 @@ module GrafanaReporter
       # @return [void]
       def pre_process(grafana)
         super(grafana)
-        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] || @variables['grafana_default_from_timezone'])
-        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] || @variables['grafana_default_to_timezone'])
+        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] ||
+                               @variables['grafana_default_from_timezone'])
+        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] ||
+                             @variables['grafana_default_to_timezone'])
       end
     end
   end

data/lib/grafana_reporter/asciidoctor/sql_table_query.rb

@@ -18,15 +18,13 @@ module GrafanaReporter
         results = replace_values(results, @variables.select { |k, _v| k =~ /^replace_values_\d+/ })
         results = filter_columns(results, @variables['filter_columns'])
         results = transpose(results, @variables['transpose'])
-        row_divider = '| '
-        row_divider = @variables['row_divider'].raw_value if @variables['row_divider'].is_a?(Grafana::Variable)
-        column_divider = ' | '
-        column_divider = @variables['column_divider'].raw_value if @variables['column_divider'].is_a?(Grafana::Variable)
+        row_div = @variables['row_divider'].is_a?(Grafana::Variable) ? @variables['row_divider'].raw_value : '| '
+        col_div = @variables['column_divider'].is_a?(Grafana::Variable) ? @variables['column_divider'].raw_value : ' | '
 
         @result = results[:content].map do |row|
-          row_divider + row.map do |item|
-            column_divider == ' | ' ? item.to_s.gsub('|', '\\|') : item.to_s
-          end.join(column_divider)
+          row_div + row.map do |item|
+            col_div == ' | ' ? item.to_s.gsub('|', '\\|') : item.to_s
+          end.join(col_div)
         end
       end
 
@@ -36,8 +34,10 @@ module GrafanaReporter
       # @return [void]
       def pre_process(grafana)
         super(grafana)
-        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] || @variables['grafana_default_from_timezone'])
-        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] || @variables['grafana_default_to_timezone'])
+        @from = translate_date(@from, @variables['grafana-report-timestamp'], false, @variables['from_timezone'] ||
+                               @variables['grafana_default_from_timezone'])
+        @to = translate_date(@to, @variables['grafana-report-timestamp'], true, @variables['to_timezone'] ||
+                             @variables['grafana_default_to_timezone'])
       end
     end
   end

data/lib/grafana_reporter/configuration.rb

@@ -27,7 +27,7 @@ module GrafanaReporter
 
     def initialize
       @config = {}
-      @logger = ::Logger.new($stderr, level: :unknown)
+      @logger = ::Logger.new($stderr, level: :info)
     end
 
     attr_accessor :logger
@@ -56,6 +56,11 @@ module GrafanaReporter
       "#{templates_folder}#{get_config('default-document-attributes:var-template')}.adoc"
     end
 
+    # @return [String] path to ssl certificate file, if manually specified, or nil
+    def ssl_cert
+      get_config('grafana-reporter:ssl-cert')
+    end
+
     # @return [String] destination filename for the report in {MODE_SINGLE_RENDER}.
     def to_file
       return get_config('to_file') || true if mode == MODE_SINGLE_RENDER
@@ -84,16 +89,6 @@ module GrafanaReporter
       get_config("grafana:#{instance}:api_key")
     end
 
-    # @param instance [String] grafana instance name, for which the value shall be retrieved.
-    # @return [Hash<String,Integer>] configured datasources for the requested grafana instance. Name as key,
-    #   ID as value.
-    def grafana_datasources(instance = 'default')
-      hash = get_config("grafana:#{instance}:datasources")
-      return nil if hash.nil?
-
-      hash.map { |k, v| [k, v] }.to_h
-    end
-
     # @return [String] configured folder, in which the report templates are stored including trailing slash.
     #   By default: current folder.
     def templates_folder
@@ -153,10 +148,11 @@ module GrafanaReporter
     # This function shall be called, before the configuration object is used in the
     # {Application::Application#run}. It ensures, that everything is setup properly
     # and all necessary folders exist. Appropriate errors are raised in case of errors.
+    # @param explicit [Boolean] true, if validation shall expect explicit (wizard) configuration file
     # @return [void]
-    def validate
+    def validate(explicit = false)
       check_deprecation
-      validate_schema(schema, @config)
+      validate_schema(schema(explicit), @config)
 
       # check if set folders exist
       raise FolderDoesNotExistError.new(reports_folder, 'reports-folder') unless File.directory?(reports_folder)
@@ -176,12 +172,8 @@ module GrafanaReporter
 
       cur_pos = @config
       levels.each do |subpath|
-        if cur_pos[subpath]
-          cur_pos = cur_pos[subpath]
-        else
-          cur_pos[subpath] = {}
-          cur_pos = cur_pos[subpath]
-        end
+        cur_pos[subpath] = {} unless cur_pos[subpath]
+        cur_pos = cur_pos[subpath]
       end
 
       cur_pos[last_level] = value
@@ -193,7 +185,7 @@ module GrafanaReporter
     #
     # param other_config [Configuration] other configuration object
     def merge!(other_config)
-      self.config.merge!(other_config.config) { |_key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2) : v2 }
+      config.merge!(other_config.config) { |_key, v1, v2| v1.is_a?(Hash) && v2.is_a?(Hash) ? v1.merge(v2) : v2 }
       update_configuration
     end
 
@@ -202,20 +194,21 @@ module GrafanaReporter
     def check_deprecation
       return if report_class
 
-      logger.warn('DEPRECATION WARNING: Your configuration explicitly needs to specify the \'grafana-reporter:report-class\' value. '\
-                  'Currently this defaults to \'GrafanaReporter::Asciidoctor::Report\'. You can get rid of this warning, if you explicitly '\
-                  'set this configuration in your configuration file. Setting this default will be removed in a future version.')
+      logger.warn('DEPRECATION WARNING: Your configuration explicitly needs to specify the '\
+                  '\'grafana-reporter:report-class\' value.  Currently this defaults to '\
+                  '\'GrafanaReporter::Asciidoctor::Report\'. You can get rid of this warning, if you '\
+                  'explicitly set this configuration in your configuration file. Setting this default will be '\
+                  'removed in a future version.')
       set_param('grafana-reporter:report-class', 'GrafanaReporter::Asciidoctor::Report')
     end
 
     def update_configuration
-      if get_config('grafana-reporter:debug-level') =~ /DEBUG|INFO|WARN|ERROR|FATAL|UNKNOWN/
-        @logger.level = Object.const_get("::Logger::Severity::#{get_config('grafana-reporter:debug-level')}")
-      end
+      debug_level = get_config('grafana-reporter:debug-level')
+      rep_class = get_config('grafana-reporter:report-class')
 
-      if get_config('grafana-reporter:report-class')
-        self.report_class = Object.const_get(get_config('grafana-reporter:report-class'))
-      end
+      @logger.level = Object.const_get("::Logger::Severity::#{debug_level}") if debug_level =~ /DEBUG|INFO|WARN|
+                                                                                                ERROR|FATAL|UNKNOWN/x
+      self.report_class = Object.const_get(rep_class) if rep_class
     end
 
     def get_config(path)
@@ -238,20 +231,16 @@ module GrafanaReporter
 
         if key.nil?
           # apply to all on this level
-          case
-          when subject.is_a?(Hash)
-            if subject.length < min_occurence
-              raise ConfigurationDoesNotMatchSchemaError.new(key, 'occur', min_occurence, subject.length)
-            end
-
-            subject.each do |k, _v|
-              sub_scheme = {}
-              sub_scheme[k] = schema[nil]
-              validate_schema(sub_scheme, subject)
-            end
-
-          else
-            raise ConfigurationError, "Unhandled configuration data type '#{subject.class}'."
+          raise ConfigurationError, "Unhandled configuration data type '#{subject.class}'." unless subject.is_a?(Hash)
+
+          if subject.length < min_occurence
+            raise ConfigurationDoesNotMatchSchemaError.new(key, 'occur', min_occurence, subject.length)
+          end
+
+          subject.each do |k, _v|
+            sub_scheme = {}
+            sub_scheme[k] = schema[nil]
+            validate_schema(sub_scheme, subject)
           end
 
         # apply to single item
@@ -277,7 +266,7 @@ module GrafanaReporter
       end
     end
 
-    def schema
+    def schema(explicit)
       {
         'grafana' =>
          [
@@ -288,13 +277,12 @@ module GrafanaReporter
                 Hash, 1,
                 {
                   'host' => [String, 1],
-                  'api_key' => [String, 0],
-                  'datasources' => [Hash, 0, { nil => [Integer, 1] }]
+                  'api_key' => [String, 0]
                 }
               ]
            }
          ],
-        'default-document-attributes' => [Hash, 0],
+        'default-document-attributes' => [Hash, explicit ? 1 : 0],
         'grafana-reporter' =>
         [
           Hash, 1,
@@ -302,11 +290,12 @@ module GrafanaReporter
             'debug-level' => [String, 0],
             'run-mode' => [String, 0],
             'test-instance' => [String, 0],
-            'templates-folder' => [String, 0],
+            'templates-folder' => [String, explicit ? 1 : 0],
             'report-class' => [String, 1],
-            'reports-folder' => [String, 0],
-            'report-retention' => [Integer, 0],
-            'webservice-port' => [Integer, 0]
+            'reports-folder' => [String, explicit ? 1 : 0],
+            'report-retention' => [Integer, explicit ? 1 : 0],
+            'ssl-cert' => [String, 0],
+            'webservice-port' => [Integer, explicit ? 1 : 0]
           }
         ]
       }