Skip to content

observability_pipeline: Fix nil dereference when sources/processors/destinations are unset in pipeline config #3137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

observability_pipeline: Fix nil dereference when sources/processors/destinations are unset in pipeline config #3137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 73 additions & 55 deletions datadog/fwprovider/resource_datadog_observability_pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ type observabilityPipelineModel struct {
}

type configModel struct {
Sources sourcesModel `tfsdk:"sources"`
Processors processorsModel `tfsdk:"processors"`
Destinations destinationsModel `tfsdk:"destinations"`
Sources *sourcesModel `tfsdk:"sources"`
Processors *processorsModel `tfsdk:"processors"`
Destinations *destinationsModel `tfsdk:"destinations"`
}
type sourcesModel struct {
DatadogAgentSource []*datadogAgentSourceModel `tfsdk:"datadog_agent"`
Expand Down Expand Up @@ -2398,150 +2398,168 @@ func expandPipeline(ctx context.Context, state *observabilityPipelineModel) (*da
config := datadogV2.NewObservabilityPipelineConfigWithDefaults()

// Sources
for _, s := range state.Config.Sources.DatadogAgentSource {
if state.Config.Sources != nil {
expandPipelineSources(config, state.Config.Sources)
}

// Processors
if state.Config.Processors != nil {
expandPipelineProcessors(ctx, config, state.Config.Processors)
}

// Destinations
if state.Config.Destinations != nil {
expandPipelineDestinations(ctx, config, state.Config.Destinations)
}

attrs.SetConfig(*config)
data.SetAttributes(*attrs)
req.SetData(*data)
return req, diags
}

func expandPipelineSources(config *datadogV2.ObservabilityPipelineConfig, sources *sourcesModel) {
for _, s := range sources.DatadogAgentSource {
config.Sources = append(config.Sources, expandDatadogAgentSource(s))
}
for _, k := range state.Config.Sources.KafkaSource {
for _, k := range sources.KafkaSource {
config.Sources = append(config.Sources, expandKafkaSource(k))
}
for _, f := range state.Config.Sources.FluentdSource {
for _, f := range sources.FluentdSource {
config.Sources = append(config.Sources, expandFluentdSource(f))
}
for _, f := range state.Config.Sources.FluentBitSource {
for _, f := range sources.FluentBitSource {
config.Sources = append(config.Sources, expandFluentBitSource(f))
}
for _, s := range state.Config.Sources.HttpServerSource {
for _, s := range sources.HttpServerSource {
config.Sources = append(config.Sources, expandHttpServerSource(s))
}
for _, s := range state.Config.Sources.SplunkHecSource {
for _, s := range sources.SplunkHecSource {
config.Sources = append(config.Sources, expandSplunkHecSource(s))
}
for _, s := range state.Config.Sources.SplunkTcpSource {
for _, s := range sources.SplunkTcpSource {
config.Sources = append(config.Sources, expandSplunkTcpSource(s))
}
for _, s := range state.Config.Sources.AmazonS3Source {
for _, s := range sources.AmazonS3Source {
config.Sources = append(config.Sources, expandAmazonS3Source(s))
}
for _, s := range state.Config.Sources.RsyslogSource {
for _, s := range sources.RsyslogSource {
config.Sources = append(config.Sources, expandRsyslogSource(s))
}
for _, s := range state.Config.Sources.SyslogNgSource {
for _, s := range sources.SyslogNgSource {
config.Sources = append(config.Sources, expandSyslogNgSource(s))
}
for _, s := range state.Config.Sources.SumoLogicSource {
for _, s := range sources.SumoLogicSource {
config.Sources = append(config.Sources, expandSumoLogicSource(s))
}
for _, a := range state.Config.Sources.AmazonDataFirehoseSource {
for _, a := range sources.AmazonDataFirehoseSource {
config.Sources = append(config.Sources, expandAmazonDataFirehoseSource(a))
}
for _, h := range state.Config.Sources.HttpClientSource {
for _, h := range sources.HttpClientSource {
config.Sources = append(config.Sources, expandHttpClientSource(h))
}
for _, g := range state.Config.Sources.GooglePubSubSource {
for _, g := range sources.GooglePubSubSource {
config.Sources = append(config.Sources, expandGooglePubSubSource(g))
}
for _, l := range state.Config.Sources.LogstashSource {
for _, l := range sources.LogstashSource {
config.Sources = append(config.Sources, expandLogstashSource(l))
}
}

// Processors
for _, p := range state.Config.Processors.FilterProcessor {
func expandPipelineProcessors(ctx context.Context, config *datadogV2.ObservabilityPipelineConfig, processors *processorsModel) {
for _, p := range processors.FilterProcessor {
config.Processors = append(config.Processors, expandFilterProcessor(ctx, p))
}
for _, p := range state.Config.Processors.ParseJsonProcessor {
for _, p := range processors.ParseJsonProcessor {
config.Processors = append(config.Processors, expandParseJsonProcessor(ctx, p))
}
for _, p := range state.Config.Processors.AddFieldsProcessor {
for _, p := range processors.AddFieldsProcessor {
config.Processors = append(config.Processors, expandAddFieldsProcessor(ctx, p))
}
for _, p := range state.Config.Processors.RenameFieldsProcessor {
for _, p := range processors.RenameFieldsProcessor {
config.Processors = append(config.Processors, expandRenameFieldsProcessor(ctx, p))
}
for _, p := range state.Config.Processors.RemoveFieldsProcessor {
for _, p := range processors.RemoveFieldsProcessor {
config.Processors = append(config.Processors, expandRemoveFieldsProcessor(ctx, p))
}
for _, p := range state.Config.Processors.QuotaProcessor {
for _, p := range processors.QuotaProcessor {
config.Processors = append(config.Processors, expandQuotaProcessor(ctx, p))
}
for _, p := range state.Config.Processors.DedupeProcessor {
for _, p := range processors.DedupeProcessor {
config.Processors = append(config.Processors, expandDedupeProcessor(ctx, p))
}
for _, p := range state.Config.Processors.ReduceProcessor {
for _, p := range processors.ReduceProcessor {
config.Processors = append(config.Processors, expandReduceProcessor(ctx, p))
}
for _, p := range state.Config.Processors.ThrottleProcessor {
for _, p := range processors.ThrottleProcessor {
config.Processors = append(config.Processors, expandThrottleProcessor(ctx, p))
}
for _, p := range state.Config.Processors.AddEnvVarsProcessor {
for _, p := range processors.AddEnvVarsProcessor {
config.Processors = append(config.Processors, expandAddEnvVarsProcessor(ctx, p))
}
for _, p := range state.Config.Processors.EnrichmentTableProcessor {
for _, p := range processors.EnrichmentTableProcessor {
config.Processors = append(config.Processors, expandEnrichmentTableProcessor(ctx, p))
}
for _, p := range state.Config.Processors.OcsfMapperProcessor {
for _, p := range processors.OcsfMapperProcessor {
config.Processors = append(config.Processors, expandOcsfMapperProcessor(ctx, p))
}
for _, p := range state.Config.Processors.ParseGrokProcessor {
for _, p := range processors.ParseGrokProcessor {
config.Processors = append(config.Processors, expandParseGrokProcessor(ctx, p))
}
for _, p := range state.Config.Processors.SampleProcessor {
for _, p := range processors.SampleProcessor {
config.Processors = append(config.Processors, expandSampleProcessor(ctx, p))
}
for _, p := range state.Config.Processors.GenerateMetricsProcessor {
for _, p := range processors.GenerateMetricsProcessor {
config.Processors = append(config.Processors, expandGenerateMetricsProcessor(ctx, p))
}
for _, p := range state.Config.Processors.SensitiveDataScannerProcessor {
for _, p := range processors.SensitiveDataScannerProcessor {
config.Processors = append(config.Processors, expandSensitiveDataScannerProcessor(ctx, p))
}
}

// Destinations
for _, d := range state.Config.Destinations.DatadogLogsDestination {
func expandPipelineDestinations(ctx context.Context, config *datadogV2.ObservabilityPipelineConfig, destinations *destinationsModel) {
for _, d := range destinations.DatadogLogsDestination {
config.Destinations = append(config.Destinations, expandDatadogLogsDestination(ctx, d))
}
for _, d := range state.Config.Destinations.SplunkHecDestination {
for _, d := range destinations.SplunkHecDestination {
config.Destinations = append(config.Destinations, expandSplunkHecDestination(ctx, d))
}
for _, d := range state.Config.Destinations.GoogleCloudStorageDestination {
for _, d := range destinations.GoogleCloudStorageDestination {
config.Destinations = append(config.Destinations, expandGoogleCloudStorageDestination(ctx, d))
}
for _, d := range state.Config.Destinations.SumoLogicDestination {
for _, d := range destinations.SumoLogicDestination {
config.Destinations = append(config.Destinations, expandSumoLogicDestination(ctx, d))
}
for _, d := range state.Config.Destinations.RsyslogDestination {
for _, d := range destinations.RsyslogDestination {
config.Destinations = append(config.Destinations, expandRsyslogDestination(ctx, d))
}
for _, d := range state.Config.Destinations.SyslogNgDestination {
for _, d := range destinations.SyslogNgDestination {
config.Destinations = append(config.Destinations, expandSyslogNgDestination(ctx, d))
}
for _, d := range state.Config.Destinations.ElasticsearchDestination {
for _, d := range destinations.ElasticsearchDestination {
config.Destinations = append(config.Destinations, expandElasticsearchDestination(ctx, d))
}
for _, d := range state.Config.Destinations.AzureStorageDestination {
for _, d := range destinations.AzureStorageDestination {
config.Destinations = append(config.Destinations, expandAzureStorageDestination(ctx, d))
}
for _, d := range state.Config.Destinations.MicrosoftSentinelDestination {
for _, d := range destinations.MicrosoftSentinelDestination {
config.Destinations = append(config.Destinations, expandMicrosoftSentinelDestination(ctx, d))
}
for _, d := range state.Config.Destinations.GoogleChronicleDestination {
for _, d := range destinations.GoogleChronicleDestination {
config.Destinations = append(config.Destinations, expandGoogleChronicleDestination(ctx, d))
}
for _, d := range state.Config.Destinations.NewRelicDestination {
for _, d := range destinations.NewRelicDestination {
config.Destinations = append(config.Destinations, expandNewRelicDestination(ctx, d))
}
for _, d := range state.Config.Destinations.SentinelOneDestination {
for _, d := range destinations.SentinelOneDestination {
config.Destinations = append(config.Destinations, expandSentinelOneDestination(ctx, d))
}
for _, d := range state.Config.Destinations.OpenSearchDestination {
for _, d := range destinations.OpenSearchDestination {
config.Destinations = append(config.Destinations, expandOpenSearchDestination(ctx, d))
}
for _, d := range state.Config.Destinations.AmazonOpenSearchDestination {
for _, d := range destinations.AmazonOpenSearchDestination {
config.Destinations = append(config.Destinations, expandAmazonOpenSearchDestination(ctx, d))
}

attrs.SetConfig(*config)
data.SetAttributes(*attrs)
req.SetData(*data)
return req, diags
}

// --- Flattening - converting API model to TF state ---
Expand Down