Prevent nil pointer dereference in dashboard import #630
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
therve
reviewed
Aug 10, 2020
juliogreff
force-pushed
the
juliogreff/dashboard-template-variable-nil-dereference
branch
from
e533853
to
8247db5
Compare
therve
requested changes
Aug 10, 2020
| @@ -305,14 +305,14 @@ func buildTerraformTemplateVariables(datadogTemplateVariables *[]datadogV1.Dashb | |||
| terraformTemplateVariables := make([]map[string]string, len(*datadogTemplateVariables)) | |||
| for i, templateVariable := range *datadogTemplateVariables { | |||
| terraformTemplateVariable := map[string]string{} | |||
| if v, ok := templateVariable.GetNameOk(); ok { | |||
| terraformTemplateVariable["name"] = *v | |||
| if v := templateVariable.GetName(); len(v) > 0 { | |||
There was a problem hiding this comment.
Ah sorry, my suggestion only works on prefix, because it's marked nullable. Other fields don't have the same property.
There was a problem hiding this comment.
No worries :) I reverted the other two as they were before then, given that it's unlikely they'll map to a nil pointer anyway.
When importing a dashboard with a template variable with no prefix, the provider panics with the following error message: ``` panic: runtime error: invalid memory address or nil pointer dereference 2020-08-10T13:42:16.345+0200 [DEBUG] plugin.terraform-provider-datadog_v2.12.1: [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x1bddcf1] 2020-08-10T13:42:16.345+0200 [DEBUG] plugin.terraform-provider-datadog_v2.12.1: 2020-08-10T13:42:16.345+0200 [DEBUG] plugin.terraform-provider-datadog_v2.12.1: goroutine 81 [running]: 2020-08-10T13:42:16.345+0200 [DEBUG] plugin.terraform-provider-datadog_v2.12.1: github.com/terraform-providers/terraform-provider-datadog/datadog.buildTerraformTemplateVariables(0xc0004a1a18, 0x1fa2ab9) 2020-08-10T13:42:16.345+0200 [DEBUG] plugin.terraform-provider-datadog_v2.12.1: github.com/terraform-providers/terraform-provider-datadog/datadog/resource_datadog_dashboard.go:296 +0x291 ``` This commit prevents by first checking if the pointer that we're going to dereference is nil. If that's the case, we assume that the template variable doesn't have a name, prefix or default, as appropriate.
juliogreff
force-pushed
the
juliogreff/dashboard-template-variable-nil-dereference
branch
from
8247db5
to
ea19573
Compare
therve
deleted the
juliogreff/dashboard-template-variable-nil-dereference
branch
This was referenced Sep 14, 2020
|
Thanks for fixing this. When will it be released in a new version of the provider? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When importing a dashboard with a template variable with no prefix, the
provider panics with the following error message:
This commit prevents by first checking if the pointer that we're going
to dereference is nil. If that's the case, we assume that the template
variable doesn't have a name, prefix or default, as appropriate.