diff --git a/config/eescfg.go b/config/eescfg.go index e4330cd58..c547d1ac3 100644 --- a/config/eescfg.go +++ b/config/eescfg.go @@ -468,51 +468,51 @@ func (eeC *EventExporterCfg) TrailerFields() []*FCTemplate { func (eeOpts *EventExporterOpts) Clone() *EventExporterOpts { return &EventExporterOpts{ - CSVFieldSeparator: eeOpts.CSVFieldSeparator, - ElsIndex: eeOpts.ElsIndex, - ElsIfPrimaryTerm: eeOpts.ElsIfPrimaryTerm, - ElsIfSeqNo: eeOpts.ElsIfSeqNo, - ElsOpType: eeOpts.ElsOpType, - ElsPipeline: eeOpts.ElsPipeline, - ElsRouting: eeOpts.ElsRouting, - ElsTimeout: eeOpts.ElsTimeout, - ElsVersion: eeOpts.ElsVersion, - ElsVersionType: eeOpts.ElsVersionType, - ElsWaitForActiveShards: eeOpts.ElsWaitForActiveShards, - SQLMaxIdleConns: eeOpts.SQLMaxIdleConns, - SQLMaxOpenConns: eeOpts.SQLMaxOpenConns, - SQLConnMaxLifetime: eeOpts.SQLConnMaxLifetime, - SQLTableName: eeOpts.SQLTableName, - SQLDBName: eeOpts.SQLDBName, - SSLMode: eeOpts.SSLMode, - KafkaTopic: eeOpts.KafkaTopic, - AMQPQueueID: eeOpts.AMQPQueueID, - AMQPRoutingKey: eeOpts.AMQPRoutingKey, - AMQPExchange: eeOpts.AMQPExchange, - AMQPExchangeType: eeOpts.AMQPExchangeType, - AWSRegion: eeOpts.AWSRegion, - AWSKey: eeOpts.AWSKey, - AWSSecret: eeOpts.AWSSecret, - AWSToken: eeOpts.AWSToken, - SQSQueueID: eeOpts.SQSQueueID, - S3BucketID: eeOpts.S3BucketID, - S3FolderPath: eeOpts.S3FolderPath, - NATSJetStream: eeOpts.NATSJetStream, - NATSSubject: eeOpts.NATSSubject, - NATSJWTFile: eeOpts.NATSJWTFile, - NATSSeedFile: eeOpts.NATSSeedFile, - NATSCertificateAuthority: eeOpts.NATSCertificateAuthority, - NATSClientCertificate: eeOpts.NATSClientCertificate, - NATSClientKey: eeOpts.NATSClientKey, - NATSJetStreamMaxWait: eeOpts.NATSJetStreamMaxWait, - RPCCodec: eeOpts.RPCCodec, - ServiceMethod: eeOpts.ServiceMethod, - KeyPath: eeOpts.KeyPath, - CertPath: eeOpts.CertPath, - CAPath: eeOpts.CAPath, - TLS: eeOpts.TLS, - RPCConnTimeout: eeOpts.RPCConnTimeout, - RPCReplyTimeout: eeOpts.RPCReplyTimeout, + CSVFieldSeparator: utils.StringPointer(*eeOpts.CSVFieldSeparator), + ElsIndex: utils.StringPointer(*eeOpts.ElsIndex), + ElsIfPrimaryTerm: utils.IntPointer(*eeOpts.ElsIfPrimaryTerm), + ElsIfSeqNo: utils.IntPointer(*eeOpts.ElsIfSeqNo), + ElsOpType: utils.StringPointer(*eeOpts.ElsOpType), + ElsPipeline: utils.StringPointer(*eeOpts.ElsPipeline), + ElsRouting: utils.StringPointer(*eeOpts.ElsRouting), + ElsTimeout: utils.DurationPointer(*eeOpts.ElsTimeout), + ElsVersion: utils.IntPointer(*eeOpts.ElsVersion), + ElsVersionType: utils.StringPointer(*eeOpts.ElsVersionType), + ElsWaitForActiveShards: utils.StringPointer(*eeOpts.ElsWaitForActiveShards), + SQLMaxIdleConns: utils.IntPointer(*eeOpts.SQLMaxIdleConns), + SQLMaxOpenConns: utils.IntPointer(*eeOpts.SQLMaxOpenConns), + SQLConnMaxLifetime: utils.DurationPointer(*eeOpts.SQLConnMaxLifetime), + SQLTableName: utils.StringPointer(*eeOpts.SQLTableName), + SQLDBName: utils.StringPointer(*eeOpts.SQLDBName), + SSLMode: utils.StringPointer(*eeOpts.SSLMode), + KafkaTopic: utils.StringPointer(*eeOpts.KafkaTopic), + AMQPQueueID: utils.StringPointer(*eeOpts.AMQPQueueID), + AMQPRoutingKey: utils.StringPointer(*eeOpts.AMQPRoutingKey), + AMQPExchange: utils.StringPointer(*eeOpts.AMQPExchange), + AMQPExchangeType: utils.StringPointer(*eeOpts.AMQPExchangeType), + AWSRegion: utils.StringPointer(*eeOpts.AWSRegion), + AWSKey: utils.StringPointer(*eeOpts.AWSKey), + AWSSecret: utils.StringPointer(*eeOpts.AWSSecret), + AWSToken: utils.StringPointer(*eeOpts.AWSToken), + SQSQueueID: utils.StringPointer(*eeOpts.SQSQueueID), + S3BucketID: utils.StringPointer(*eeOpts.S3BucketID), + S3FolderPath: utils.StringPointer(*eeOpts.S3FolderPath), + NATSJetStream: utils.BoolPointer(*eeOpts.NATSJetStream), + NATSSubject: utils.StringPointer(*eeOpts.NATSSubject), + NATSJWTFile: utils.StringPointer(*eeOpts.NATSJWTFile), + NATSSeedFile: utils.StringPointer(*eeOpts.NATSSeedFile), + NATSCertificateAuthority: utils.StringPointer(*eeOpts.NATSCertificateAuthority), + NATSClientCertificate: utils.StringPointer(*eeOpts.NATSClientCertificate), + NATSClientKey: utils.StringPointer(*eeOpts.NATSClientKey), + NATSJetStreamMaxWait: utils.DurationPointer(*eeOpts.NATSJetStreamMaxWait), + RPCCodec: utils.StringPointer(*eeOpts.RPCCodec), + ServiceMethod: utils.StringPointer(*eeOpts.ServiceMethod), + KeyPath: utils.StringPointer(*eeOpts.KeyPath), + CertPath: utils.StringPointer(*eeOpts.CertPath), + CAPath: utils.StringPointer(*eeOpts.CAPath), + TLS: utils.BoolPointer(*eeOpts.TLS), + RPCConnTimeout: utils.DurationPointer(*eeOpts.RPCConnTimeout), + RPCReplyTimeout: utils.DurationPointer(*eeOpts.RPCReplyTimeout), } } diff --git a/config/erscfg.go b/config/erscfg.go index 570c84511..654aad955 100644 --- a/config/erscfg.go +++ b/config/erscfg.go @@ -479,65 +479,65 @@ func (er *EventReaderCfg) loadFromJSONCfg(jsnCfg *EventReaderJsonCfg, msgTemplat func (erOpts *EventReaderOpts) Clone() *EventReaderOpts { return &EventReaderOpts{ - PartialPath: erOpts.PartialPath, - PartialCacheAction: erOpts.PartialCacheAction, - PartialOrderField: erOpts.PartialOrderField, - PartialCSVFieldSeparator: erOpts.PartialCSVFieldSeparator, - CSVRowLength: erOpts.CSVRowLength, - CSVFieldSeparator: erOpts.CSVFieldSeparator, - CSVHeaderDefineChar: erOpts.CSVHeaderDefineChar, - CSVLazyQuotes: erOpts.CSVLazyQuotes, - XMLRootPath: erOpts.XMLRootPath, - AMQPQueueID: erOpts.AMQPQueueID, - AMQPQueueIDProcessed: erOpts.AMQPQueueIDProcessed, - AMQPConsumerTag: erOpts.AMQPConsumerTag, - AMQPExchange: erOpts.AMQPExchange, - AMQPExchangeType: erOpts.AMQPExchangeType, - AMQPRoutingKey: erOpts.AMQPRoutingKey, - AMQPExchangeProcessed: erOpts.AMQPExchangeProcessed, - AMQPExchangeTypeProcessed: erOpts.AMQPExchangeTypeProcessed, - AMQPRoutingKeyProcessed: erOpts.AMQPRoutingKeyProcessed, - KafkaTopic: erOpts.KafkaTopic, - KafkaGroupID: erOpts.KafkaGroupID, - KafkaMaxWait: erOpts.KafkaMaxWait, - KafkaTopicProcessed: erOpts.KafkaTopicProcessed, - SQLDBName: erOpts.SQLDBName, - SQLTableName: erOpts.SQLTableName, - SSLMode: erOpts.SSLMode, - SQLDBNameProcessed: erOpts.SQLDBNameProcessed, - SQLTableNameProcessed: erOpts.SQLTableNameProcessed, - SSLModeProcessed: erOpts.SSLModeProcessed, - AWSRegion: erOpts.AWSRegion, - AWSKey: erOpts.AWSKey, - AWSSecret: erOpts.AWSSecret, - AWSToken: erOpts.AWSToken, - AWSRegionProcessed: erOpts.AWSRegionProcessed, - AWSKeyProcessed: erOpts.AWSKeyProcessed, - AWSSecretProcessed: erOpts.AWSSecretProcessed, - AWSTokenProcessed: erOpts.AWSTokenProcessed, - SQSQueueID: erOpts.SQSQueueID, - SQSQueueIDProcessed: erOpts.SQSQueueIDProcessed, - S3BucketID: erOpts.S3BucketID, - S3FolderPathProcessed: erOpts.S3FolderPathProcessed, - S3BucketIDProcessed: erOpts.S3BucketIDProcessed, - NATSJetStream: erOpts.NATSJetStream, - NATSConsumerName: erOpts.NATSConsumerName, - NATSSubject: erOpts.NATSSubject, - NATSQueueID: erOpts.NATSQueueID, - NATSJWTFile: erOpts.NATSJWTFile, - NATSSeedFile: erOpts.NATSSeedFile, - NATSCertificateAuthority: erOpts.NATSCertificateAuthority, - NATSClientCertificate: erOpts.NATSClientCertificate, - NATSClientKey: erOpts.NATSClientKey, - NATSJetStreamMaxWait: erOpts.NATSJetStreamMaxWait, - NATSJetStreamProcessed: erOpts.NATSJetStreamProcessed, - NATSSubjectProcessed: erOpts.NATSSubjectProcessed, - NATSJWTFileProcessed: erOpts.NATSJWTFileProcessed, - NATSSeedFileProcessed: erOpts.NATSSeedFileProcessed, - NATSCertificateAuthorityProcessed: erOpts.NATSCertificateAuthorityProcessed, - NATSClientCertificateProcessed: erOpts.NATSClientCertificateProcessed, - NATSClientKeyProcessed: erOpts.NATSClientKeyProcessed, - NATSJetStreamMaxWaitProcessed: erOpts.NATSJetStreamMaxWaitProcessed, + PartialPath: utils.StringPointer(*erOpts.PartialPath), + PartialCacheAction: utils.StringPointer(*erOpts.PartialCacheAction), + PartialOrderField: utils.StringPointer(*erOpts.PartialOrderField), + PartialCSVFieldSeparator: utils.StringPointer(*erOpts.PartialCSVFieldSeparator), + CSVRowLength: utils.IntPointer(*erOpts.CSVRowLength), + CSVFieldSeparator: utils.StringPointer(*erOpts.CSVFieldSeparator), + CSVHeaderDefineChar: utils.StringPointer(*erOpts.CSVHeaderDefineChar), + CSVLazyQuotes: utils.BoolPointer(*erOpts.CSVLazyQuotes), + XMLRootPath: utils.StringPointer(*erOpts.XMLRootPath), + AMQPQueueID: utils.StringPointer(*erOpts.AMQPQueueID), + AMQPQueueIDProcessed: utils.StringPointer(*erOpts.AMQPQueueIDProcessed), + AMQPConsumerTag: utils.StringPointer(*erOpts.AMQPConsumerTag), + AMQPExchange: utils.StringPointer(*erOpts.AMQPExchange), + AMQPExchangeType: utils.StringPointer(*erOpts.AMQPExchangeType), + AMQPRoutingKey: utils.StringPointer(*erOpts.AMQPRoutingKey), + AMQPExchangeProcessed: utils.StringPointer(*erOpts.AMQPExchangeProcessed), + AMQPExchangeTypeProcessed: utils.StringPointer(*erOpts.AMQPExchangeTypeProcessed), + AMQPRoutingKeyProcessed: utils.StringPointer(*erOpts.AMQPRoutingKeyProcessed), + KafkaTopic: utils.StringPointer(*erOpts.KafkaTopic), + KafkaGroupID: utils.StringPointer(*erOpts.KafkaGroupID), + KafkaMaxWait: utils.DurationPointer(*erOpts.KafkaMaxWait), + KafkaTopicProcessed: utils.StringPointer(*erOpts.KafkaTopicProcessed), + SQLDBName: utils.StringPointer(*erOpts.SQLDBName), + SQLTableName: utils.StringPointer(*erOpts.SQLTableName), + SSLMode: utils.StringPointer(*erOpts.SSLMode), + SQLDBNameProcessed: utils.StringPointer(*erOpts.SQLDBNameProcessed), + SQLTableNameProcessed: utils.StringPointer(*erOpts.SQLTableNameProcessed), + SSLModeProcessed: utils.StringPointer(*erOpts.SSLModeProcessed), + AWSRegion: utils.StringPointer(*erOpts.AWSRegion), + AWSKey: utils.StringPointer(*erOpts.AWSKey), + AWSSecret: utils.StringPointer(*erOpts.AWSSecret), + AWSToken: utils.StringPointer(*erOpts.AWSToken), + AWSRegionProcessed: utils.StringPointer(*erOpts.AWSRegionProcessed), + AWSKeyProcessed: utils.StringPointer(*erOpts.AWSKeyProcessed), + AWSSecretProcessed: utils.StringPointer(*erOpts.AWSSecretProcessed), + AWSTokenProcessed: utils.StringPointer(*erOpts.AWSTokenProcessed), + SQSQueueID: utils.StringPointer(*erOpts.SQSQueueID), + SQSQueueIDProcessed: utils.StringPointer(*erOpts.SQSQueueIDProcessed), + S3BucketID: utils.StringPointer(*erOpts.S3BucketID), + S3FolderPathProcessed: utils.StringPointer(*erOpts.S3FolderPathProcessed), + S3BucketIDProcessed: utils.StringPointer(*erOpts.S3BucketIDProcessed), + NATSJetStream: utils.BoolPointer(*erOpts.NATSJetStream), + NATSConsumerName: utils.StringPointer(*erOpts.NATSConsumerName), + NATSSubject: utils.StringPointer(*erOpts.NATSSubject), + NATSQueueID: utils.StringPointer(*erOpts.NATSQueueID), + NATSJWTFile: utils.StringPointer(*erOpts.NATSJWTFile), + NATSSeedFile: utils.StringPointer(*erOpts.NATSSeedFile), + NATSCertificateAuthority: utils.StringPointer(*erOpts.NATSCertificateAuthority), + NATSClientCertificate: utils.StringPointer(*erOpts.NATSClientCertificate), + NATSClientKey: utils.StringPointer(*erOpts.NATSClientKey), + NATSJetStreamMaxWait: utils.DurationPointer(*erOpts.NATSJetStreamMaxWait), + NATSJetStreamProcessed: utils.BoolPointer(*erOpts.NATSJetStreamProcessed), + NATSSubjectProcessed: utils.StringPointer(*erOpts.NATSSubjectProcessed), + NATSJWTFileProcessed: utils.StringPointer(*erOpts.NATSJWTFileProcessed), + NATSSeedFileProcessed: utils.StringPointer(*erOpts.NATSSeedFileProcessed), + NATSCertificateAuthorityProcessed: utils.StringPointer(*erOpts.NATSCertificateAuthorityProcessed), + NATSClientCertificateProcessed: utils.StringPointer(*erOpts.NATSClientCertificateProcessed), + NATSClientKeyProcessed: utils.StringPointer(*erOpts.NATSClientKeyProcessed), + NATSJetStreamMaxWaitProcessed: utils.DurationPointer(*erOpts.NATSJetStreamMaxWaitProcessed), } }