Skip to content

Commit 7401292

Browse files
discosturmarcofranssen
discostur
authored and
marcofranssen
committed
refactor
Signed-off-by: Kilian Ries <[email protected]>
1 parent 4cc05ef commit 7401292

File tree

2 files changed

+62
-178
lines changed

2 files changed

+62
-178
lines changed

‎apis/fluentd/v1alpha1/plugins/output/types.go‎

Lines changed: 59 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -476,15 +476,9 @@ func (o *Output) opensearchPlugin(parent *params.PluginStore, loader plugins.Sec
476476
}
477477

478478
func (o *Output) opensearchBasicConnection(parent *params.PluginStore, loader plugins.SecretLoader) error {
479-
if o.Opensearch.Host != nil {
480-
parent.InsertPairs("host", fmt.Sprint(*o.Opensearch.Host))
481-
}
482-
if o.Opensearch.Port != nil {
483-
parent.InsertPairs("port", fmt.Sprint(*o.Opensearch.Port))
484-
}
485-
if o.Opensearch.Hosts != nil {
486-
parent.InsertPairs("hosts", fmt.Sprint(*o.Opensearch.Hosts))
487-
}
479+
params.InsertPairs(parent, "host", o.Opensearch.Host)
480+
params.InsertPairs(parent, "port", o.Opensearch.Port)
481+
params.InsertPairs(parent, "hosts", o.Opensearch.Hosts)
488482
if o.Opensearch.User != nil {
489483
user, err := loader.LoadSecret(*o.Opensearch.User)
490484
if err != nil {
@@ -499,210 +493,98 @@ func (o *Output) opensearchBasicConnection(parent *params.PluginStore, loader pl
499493
}
500494
parent.InsertPairs("password", pwd)
501495
}
502-
if o.Opensearch.Scheme != nil {
503-
parent.InsertPairs("scheme", fmt.Sprint(*o.Opensearch.Scheme))
504-
}
505-
if o.Opensearch.Path != nil {
506-
parent.InsertPairs("path", fmt.Sprint(*o.Opensearch.Path))
507-
}
496+
params.InsertPairs(parent, "scheme", o.Opensearch.Scheme)
497+
params.InsertPairs(parent, "path", o.Opensearch.Path)
508498
return nil
509499
}
510500

511501
func (o *Output) opensearchIndexConfig(parent *params.PluginStore) {
512-
if o.Opensearch.IndexName != nil {
513-
parent.InsertPairs("index_name", fmt.Sprint(*o.Opensearch.IndexName))
514-
}
515-
if o.Opensearch.LogstashFormat != nil {
516-
parent.InsertPairs("logstash_format", fmt.Sprint(*o.Opensearch.LogstashFormat))
517-
}
518-
if o.Opensearch.LogstashPrefix != nil {
519-
parent.InsertPairs("logstash_prefix", fmt.Sprint(*o.Opensearch.LogstashPrefix))
520-
}
521-
if o.Opensearch.IndexDatePattern != nil {
522-
parent.InsertPairs("index_date_pattern", fmt.Sprint(*o.Opensearch.IndexDatePattern))
523-
}
524-
if o.Opensearch.UtcIndex != nil {
525-
parent.InsertPairs("utc_index", fmt.Sprint(*o.Opensearch.UtcIndex))
526-
}
502+
params.InsertPairs(parent, "index_name", o.Opensearch.IndexName)
503+
params.InsertPairs(parent, "logstash_format", o.Opensearch.LogstashFormat)
504+
params.InsertPairs(parent, "logstash_prefix", o.Opensearch.LogstashPrefix)
505+
params.InsertPairs(parent, "index_date_pattern", o.Opensearch.IndexDatePattern)
506+
params.InsertPairs(parent, "utc_index", o.Opensearch.UtcIndex)
527507
}
528508

529509
func (o *Output) opensearchSSLConfig(parent *params.PluginStore, loader plugins.SecretLoader) error {
530-
if o.Opensearch.SslVerify != nil {
531-
parent.InsertPairs("ssl_verify", fmt.Sprint(*o.Opensearch.SslVerify))
532-
}
533-
if o.Opensearch.CAFile != nil {
534-
parent.InsertPairs("ca_file", fmt.Sprint(*o.Opensearch.CAFile))
535-
}
536-
if o.Opensearch.ClientCert != nil {
537-
parent.InsertPairs("client_cert", fmt.Sprint(*o.Opensearch.ClientCert))
538-
}
539-
if o.Opensearch.ClientKey != nil {
540-
parent.InsertPairs("client_key", fmt.Sprint(*o.Opensearch.ClientKey))
541-
}
510+
params.InsertPairs(parent, "ssl_verify", o.Opensearch.SslVerify)
511+
params.InsertPairs(parent, "ca_file", o.Opensearch.CAFile)
512+
params.InsertPairs(parent, "client_cert", o.Opensearch.ClientCert)
513+
params.InsertPairs(parent, "client_key", o.Opensearch.ClientKey)
542514
if o.Opensearch.ClientKeyPassword != nil {
543515
pwd, err := loader.LoadSecret(*o.Opensearch.ClientKeyPassword)
544516
if err != nil {
545517
return err
546518
}
547519
parent.InsertPairs("client_key_pass", pwd)
548520
}
549-
if o.Opensearch.SslVersion != nil {
550-
parent.InsertPairs("ssl_version", fmt.Sprint(*o.Opensearch.SslVersion))
551-
}
552-
if o.Opensearch.SslMinVersion != nil {
553-
parent.InsertPairs("ssl_min_version", fmt.Sprint(*o.Opensearch.SslMinVersion))
554-
}
555-
if o.Opensearch.SslMaxVersion != nil {
556-
parent.InsertPairs("ssl_max_version", fmt.Sprint(*o.Opensearch.SslMaxVersion))
557-
}
521+
params.InsertPairs(parent, "ssl_version", o.Opensearch.SslVersion)
522+
params.InsertPairs(parent, "ssl_min_version", o.Opensearch.SslMinVersion)
523+
params.InsertPairs(parent, "ssl_max_version", o.Opensearch.SslMaxVersion)
558524
return nil
559525
}
560526

561527
func (o *Output) opensearchConnectionManagement(parent *params.PluginStore) {
562-
if o.Opensearch.LogOs400Reason != nil {
563-
parent.InsertPairs("log_os_400_reason", fmt.Sprint(*o.Opensearch.LogOs400Reason))
564-
}
565-
if o.Opensearch.RequestTimeout != nil {
566-
parent.InsertPairs("request_timeout", fmt.Sprint(*o.Opensearch.RequestTimeout))
567-
}
568-
if o.Opensearch.ReconnectOnError != nil {
569-
parent.InsertPairs("reconnect_on_error", fmt.Sprint(*o.Opensearch.ReconnectOnError))
570-
}
571-
if o.Opensearch.ReloadConnections != nil {
572-
parent.InsertPairs("reload_connections", fmt.Sprint(*o.Opensearch.ReloadConnections))
573-
}
574-
if o.Opensearch.ReloadAfter != nil {
575-
parent.InsertPairs("reload_after", fmt.Sprint(*o.Opensearch.ReloadAfter))
576-
}
577-
if o.Opensearch.ReloadOnFailure != nil {
578-
parent.InsertPairs("reload_on_failure", fmt.Sprint(*o.Opensearch.ReloadOnFailure))
579-
}
528+
params.InsertPairs(parent, "log_os_400_reason", o.Opensearch.LogOs400Reason)
529+
params.InsertPairs(parent, "request_timeout", o.Opensearch.RequestTimeout)
530+
params.InsertPairs(parent, "reconnect_on_error", o.Opensearch.ReconnectOnError)
531+
params.InsertPairs(parent, "reload_connections", o.Opensearch.ReloadConnections)
532+
params.InsertPairs(parent, "reload_after", o.Opensearch.ReloadAfter)
533+
params.InsertPairs(parent, "reload_on_failure", o.Opensearch.ReloadOnFailure)
580534
}
581535

582536
func (o *Output) opensearchVersionDetection(parent *params.PluginStore) {
583-
if o.Opensearch.MaxRetryGetOsVersion != nil {
584-
parent.InsertPairs("max_retry_get_os_version", fmt.Sprint(*o.Opensearch.MaxRetryGetOsVersion))
585-
}
586-
if o.Opensearch.FailOnDetectingOsVersionRetryExceed != nil {
587-
parent.InsertPairs("fail_on_detecting_os_version_retry_exceed", fmt.Sprint(*o.Opensearch.FailOnDetectingOsVersionRetryExceed))
588-
}
589-
if o.Opensearch.DefaultOpensearchVersion != nil {
590-
parent.InsertPairs("default_opensearch_version", fmt.Sprint(*o.Opensearch.DefaultOpensearchVersion))
591-
}
592-
if o.Opensearch.VerifyOsVersionAtStartup != nil {
593-
parent.InsertPairs("verify_os_version_at_startup", fmt.Sprint(*o.Opensearch.VerifyOsVersionAtStartup))
594-
}
537+
params.InsertPairs(parent, "max_retry_get_os_version", o.Opensearch.MaxRetryGetOsVersion)
538+
params.InsertPairs(parent, "fail_on_detecting_os_version_retry_exceed", o.Opensearch.FailOnDetectingOsVersionRetryExceed)
539+
params.InsertPairs(parent, "default_opensearch_version", o.Opensearch.DefaultOpensearchVersion)
540+
params.InsertPairs(parent, "verify_os_version_at_startup", o.Opensearch.VerifyOsVersionAtStartup)
595541
}
596542

597543
func (o *Output) opensearchTemplateManagement(parent *params.PluginStore) {
598-
if o.Opensearch.TemplateOverwrite != nil {
599-
parent.InsertPairs("template_overwrite", fmt.Sprint(*o.Opensearch.TemplateOverwrite))
600-
}
601-
if o.Opensearch.MaxRetryPuttingTemplate != nil {
602-
parent.InsertPairs("max_retry_putting_template", fmt.Sprint(*o.Opensearch.MaxRetryPuttingTemplate))
603-
}
604-
if o.Opensearch.FailOnPuttingTemplateRetryExceed != nil {
605-
parent.InsertPairs("fail_on_putting_template_retry_exceed", fmt.Sprint(*o.Opensearch.FailOnPuttingTemplateRetryExceed))
606-
}
607-
if o.Opensearch.UseLegacyTemplate != nil {
608-
parent.InsertPairs("use_legacy_template", fmt.Sprint(*o.Opensearch.UseLegacyTemplate))
609-
}
544+
params.InsertPairs(parent, "template_overwrite", o.Opensearch.TemplateOverwrite)
545+
params.InsertPairs(parent, "max_retry_putting_template", o.Opensearch.MaxRetryPuttingTemplate)
546+
params.InsertPairs(parent, "fail_on_putting_template_retry_exceed", o.Opensearch.FailOnPuttingTemplateRetryExceed)
547+
params.InsertPairs(parent, "use_legacy_template", o.Opensearch.UseLegacyTemplate)
610548
}
611549

612550
func (o *Output) opensearchPerformanceTuning(parent *params.PluginStore) {
613-
if o.Opensearch.SnifferClassName != nil {
614-
parent.InsertPairs("sniffer_class_name", fmt.Sprint(*o.Opensearch.SnifferClassName))
615-
}
616-
if o.Opensearch.SelectorClassName != nil {
617-
parent.InsertPairs("selector_class_name", fmt.Sprint(*o.Opensearch.SelectorClassName))
618-
}
619-
if o.Opensearch.HttpBackend != nil {
620-
parent.InsertPairs("http_backend", fmt.Sprint(*o.Opensearch.HttpBackend))
621-
}
622-
if o.Opensearch.HttpBackendExconNonblock != nil {
623-
parent.InsertPairs("http_backend_excon_nonblock", fmt.Sprint(*o.Opensearch.HttpBackendExconNonblock))
624-
}
625-
if o.Opensearch.CompressionLevel != nil {
626-
parent.InsertPairs("compression_level", fmt.Sprint(*o.Opensearch.CompressionLevel))
627-
}
628-
if o.Opensearch.PreferOjSerializer != nil {
629-
parent.InsertPairs("prefer_oj_serializer", fmt.Sprint(*o.Opensearch.PreferOjSerializer))
630-
}
631-
if o.Opensearch.BulkMessageRequestThreshold != nil {
632-
parent.InsertPairs("bulk_message_request_threshold", fmt.Sprint(*o.Opensearch.BulkMessageRequestThreshold))
633-
}
551+
params.InsertPairs(parent, "sniffer_class_name", o.Opensearch.SnifferClassName)
552+
params.InsertPairs(parent, "selector_class_name", o.Opensearch.SelectorClassName)
553+
params.InsertPairs(parent, "http_backend", o.Opensearch.HttpBackend)
554+
params.InsertPairs(parent, "http_backend_excon_nonblock", o.Opensearch.HttpBackendExconNonblock)
555+
params.InsertPairs(parent, "compression_level", o.Opensearch.CompressionLevel)
556+
params.InsertPairs(parent, "prefer_oj_serializer", o.Opensearch.PreferOjSerializer)
557+
params.InsertPairs(parent, "bulk_message_request_threshold", o.Opensearch.BulkMessageRequestThreshold)
634558
}
635559

636560
func (o *Output) opensearchRecordHandling(parent *params.PluginStore) {
637-
if o.Opensearch.SuppressTypeName != nil {
638-
parent.InsertPairs("suppress_type_name", fmt.Sprint(*o.Opensearch.SuppressTypeName))
639-
}
640-
if o.Opensearch.ContentType != nil {
641-
parent.InsertPairs("content_type", fmt.Sprint(*o.Opensearch.ContentType))
642-
}
643-
if o.Opensearch.IncludeTagKey != nil {
644-
parent.InsertPairs("include_tag_key", fmt.Sprint(*o.Opensearch.IncludeTagKey))
645-
}
646-
if o.Opensearch.TagKey != nil {
647-
parent.InsertPairs("tag_key", fmt.Sprint(*o.Opensearch.TagKey))
648-
}
649-
if o.Opensearch.IdKey != nil {
650-
parent.InsertPairs("id_key", fmt.Sprint(*o.Opensearch.IdKey))
651-
}
652-
if o.Opensearch.RemoveKeys != nil {
653-
parent.InsertPairs("remove_keys", fmt.Sprint(*o.Opensearch.RemoveKeys))
654-
}
655-
if o.Opensearch.RemoveKeysOnUpdate != nil {
656-
parent.InsertPairs("remove_keys_on_update", fmt.Sprint(*o.Opensearch.RemoveKeysOnUpdate))
657-
}
658-
if o.Opensearch.WriteOperation != nil {
659-
parent.InsertPairs("write_operation", fmt.Sprint(*o.Opensearch.WriteOperation))
660-
}
661-
if o.Opensearch.EmitErrorForMissingId != nil {
662-
parent.InsertPairs("emit_error_for_missing_id", fmt.Sprint(*o.Opensearch.EmitErrorForMissingId))
663-
}
664-
if o.Opensearch.SuppressDocWrap != nil {
665-
parent.InsertPairs("suppress_doc_wrap", fmt.Sprint(*o.Opensearch.SuppressDocWrap))
666-
}
561+
params.InsertPairs(parent, "suppress_type_name", o.Opensearch.SuppressTypeName)
562+
params.InsertPairs(parent, "content_type", o.Opensearch.ContentType)
563+
params.InsertPairs(parent, "include_tag_key", o.Opensearch.IncludeTagKey)
564+
params.InsertPairs(parent, "tag_key", o.Opensearch.TagKey)
565+
params.InsertPairs(parent, "id_key", o.Opensearch.IdKey)
566+
params.InsertPairs(parent, "remove_keys", o.Opensearch.RemoveKeys)
567+
params.InsertPairs(parent, "remove_keys_on_update", o.Opensearch.RemoveKeysOnUpdate)
568+
params.InsertPairs(parent, "write_operation", o.Opensearch.WriteOperation)
569+
params.InsertPairs(parent, "emit_error_for_missing_id", o.Opensearch.EmitErrorForMissingId)
570+
params.InsertPairs(parent, "suppress_doc_wrap", o.Opensearch.SuppressDocWrap)
667571
}
668572

669573
func (o *Output) opensearchAdvancedOptions(parent *params.PluginStore) {
670-
if o.Opensearch.CustomHeaders != nil {
671-
parent.InsertPairs("custom_headers", fmt.Sprint(*o.Opensearch.CustomHeaders))
672-
}
673-
if o.Opensearch.Pipeline != nil {
674-
parent.InsertPairs("pipeline", fmt.Sprint(*o.Opensearch.Pipeline))
675-
}
676-
if o.Opensearch.IgnoreExceptions != nil {
677-
parent.InsertPairs("ignore_exceptions", fmt.Sprint(*o.Opensearch.IgnoreExceptions))
678-
}
679-
if o.Opensearch.ExceptionBackup != nil {
680-
parent.InsertPairs("exception_backup", fmt.Sprint(*o.Opensearch.ExceptionBackup))
681-
}
682-
if o.Opensearch.ApplicationName != nil {
683-
parent.InsertPairs("application_name", fmt.Sprint(*o.Opensearch.ApplicationName))
684-
}
574+
params.InsertPairs(parent, "custom_headers", o.Opensearch.CustomHeaders)
575+
params.InsertPairs(parent, "pipeline", o.Opensearch.Pipeline)
576+
params.InsertPairs(parent, "ignore_exceptions", o.Opensearch.IgnoreExceptions)
577+
params.InsertPairs(parent, "exception_backup", o.Opensearch.ExceptionBackup)
578+
params.InsertPairs(parent, "application_name", o.Opensearch.ApplicationName)
685579
}
686580

687581
func (o *Output) kafka2Plugin(parent *params.PluginStore, _ plugins.SecretLoader) *params.PluginStore {
688-
if o.Kafka.Brokers != nil {
689-
parent.InsertPairs("brokers", fmt.Sprint(*o.Kafka.Brokers))
690-
}
691-
if o.Kafka.TopicKey != nil {
692-
parent.InsertPairs("topic_key", fmt.Sprint(*o.Kafka.TopicKey))
693-
}
694-
if o.Kafka.DefaultTopic != nil {
695-
parent.InsertPairs("default_topic", fmt.Sprint(*o.Kafka.DefaultTopic))
696-
}
697-
if o.Kafka.UseEventTime != nil {
698-
parent.InsertPairs("use_event_time", fmt.Sprint(*o.Kafka.UseEventTime))
699-
}
700-
if o.Kafka.RequiredAcks != nil {
701-
parent.InsertPairs("required_acks", fmt.Sprint(*o.Kafka.RequiredAcks))
702-
}
703-
if o.Kafka.CompressionCodec != nil {
704-
parent.InsertPairs("compression_codec", fmt.Sprint(*o.Kafka.CompressionCodec))
705-
}
582+
params.InsertPairs(parent, "brokers", o.Kafka.Brokers)
583+
params.InsertPairs(parent, "topic_key", o.Kafka.TopicKey)
584+
params.InsertPairs(parent, "default_topic", o.Kafka.DefaultTopic)
585+
params.InsertPairs(parent, "use_event_time", o.Kafka.UseEventTime)
586+
params.InsertPairs(parent, "required_acks", o.Kafka.RequiredAcks)
587+
params.InsertPairs(parent, "compression_codec", o.Kafka.CompressionCodec)
706588

707589
return parent
708590
}

‎apis/fluentd/v1alpha1/plugins/params/model.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (ps *PluginStore) InsertPairs(key, value string) {
3636
}
3737

3838
type ValueType interface {
39-
*string | *bool | *int | *int16 | *uint16 | *uint32
39+
*string | *bool | *int | *int16 | *int32 | *uint16 | *uint32
4040
}
4141

4242
func InsertPairs[T ValueType](ps *PluginStore, key string, value T) {
@@ -52,6 +52,8 @@ func InsertPairs[T ValueType](ps *PluginStore, key string, value T) {
5252
ps.InsertPairs(key, strconv.FormatInt(int64(*v), 10))
5353
case *int16:
5454
ps.InsertPairs(key, strconv.FormatInt(int64(*v), 10))
55+
case *int32:
56+
ps.InsertPairs(key, strconv.FormatInt(int64(*v), 10))
5557
case *uint16:
5658
ps.InsertPairs(key, strconv.FormatUint(uint64(*v), 10))
5759
case *uint32:

0 commit comments

Comments
 (0)