Use state for unknown for computed attributes which won't change during plan application #677
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -163,7 +163,9 @@ func Test_readElasticsearch(t *testing.T) { | |
| CloudID: ec.String("some CLOUD ID"), | ||
| HttpEndpoint: ec.String("http://somecluster.cloud.elastic.co:9200"), | ||
| HttpsEndpoint: ec.String("https://somecluster.cloud.elastic.co:9243"), | ||
| Config: &ElasticsearchConfig{ | ||
| Plugins: []string{}, | ||
| }, | ||
| HotTier: &ElasticsearchTopology{ | ||
| id: "hot_content", | ||
| InstanceConfigurationId: ec.String("aws.data.highio.i3"), | ||
|
|
@@ -243,6 +245,7 @@ func Test_readElasticsearch(t *testing.T) { | |
| HttpEndpoint: ec.String("http://othercluster.cloud.elastic.co:9200"), | ||
| HttpsEndpoint: ec.String("https://othercluster.cloud.elastic.co:9243"), | ||
| Config: &ElasticsearchConfig{ | ||
| Plugins: []string{}, | ||
| UserSettingsYaml: ec.String("some.setting: value"), | ||
| UserSettingsOverrideYaml: ec.String("some.setting: value2"), | ||
| UserSettingsJson: ec.String("{\"some.setting\":\"value\"}"), | ||
|
|
@@ -374,7 +377,9 @@ func Test_readElasticsearch(t *testing.T) { | |
| CloudID: ec.String("some CLOUD ID"), | ||
| HttpEndpoint: ec.String("http://somecluster.cloud.elastic.co:9200"), | ||
| HttpsEndpoint: ec.String("https://somecluster.cloud.elastic.co:9243"), | ||
| Config: &ElasticsearchConfig{ | ||
| Plugins: []string{}, | ||
| }, | ||
| HotTier: &ElasticsearchTopology{ | ||
| id: "hot_content", | ||
| InstanceConfigurationId: ec.String("aws.data.highio.i3"), | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,6 +73,9 @@ func ElasticsearchSchema() schema.Attribute { | |
| "resource_id": schema.StringAttribute{ | ||
| Description: "The Elasticsearch resource unique identifier", | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.String{ | ||
| stringplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
| "region": schema.StringAttribute{ | ||
| Description: "The Elasticsearch resource region", | ||
|
|
@@ -84,14 +87,23 @@ func ElasticsearchSchema() schema.Attribute { | |
| "cloud_id": schema.StringAttribute{ | ||
| Description: "The encoded Elasticsearch credentials to use in Beats or Logstash", | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.String{ | ||
| stringplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
| "http_endpoint": schema.StringAttribute{ | ||
| Description: "The Elasticsearch resource HTTP endpoint", | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.String{ | ||
| stringplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
| "https_endpoint": schema.StringAttribute{ | ||
| Description: "The Elasticsearch resource HTTPs endpoint", | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.String{ | ||
| stringplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
|
|
||
| "hot": elasticsearchTopologySchema("'hot' topology element", true, "hot"), | ||
|
|
@@ -139,6 +151,9 @@ func elasticsearchConfigSchema() schema.Attribute { | |
| Description: "List of Elasticsearch supported plugins, which vary from version to version. Check the Stack Pack version to see which plugins are supported for each version. This is currently only available from the UI and [ecctl](https://www.elastic.co/guide/en/ecctl/master/ecctl_stack_list.html)", | ||
| Optional: true, | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.Set{ | ||
| setplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
| "user_settings_json": schema.StringAttribute{ | ||
| Description: `JSON-formatted user level "elasticsearch.yml" setting overrides`, | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ import ( | |
| "github.com/elastic/terraform-provider-ec/ec/internal/planmodifiers" | ||
| "github.com/hashicorp/terraform-plugin-framework/resource/schema" | ||
| "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier" | ||
| "github.com/hashicorp/terraform-plugin-framework/resource/schema/objectplanmodifier" | ||
| "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" | ||
| "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" | ||
| ) | ||
|
|
@@ -87,6 +88,9 @@ func IntegrationsServerSchema() schema.Attribute { | |
| }, | ||
| }, | ||
| }, | ||
| PlanModifiers: []planmodifier.Object{ | ||
| objectplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
| "instance_configuration_id": schema.StringAttribute{ | ||
| Optional: true, | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,7 @@ import ( | |
| "github.com/hashicorp/terraform-plugin-framework/path" | ||
| "github.com/hashicorp/terraform-plugin-framework/resource" | ||
| "github.com/hashicorp/terraform-plugin-framework/resource/schema" | ||
| "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier" | ||
| "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" | ||
| "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" | ||
| "github.com/hashicorp/terraform-plugin-framework/types" | ||
|
|
@@ -91,14 +92,23 @@ func (r *Resource) Schema(_ context.Context, _ resource.SchemaRequest, resp *res | |
| "url": schema.StringAttribute{ | ||
| Description: "The extension URL which will be used in the Elastic Cloud deployment plan.", | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.String{ | ||
| stringplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
| "last_modified": schema.StringAttribute{ | ||
| Description: "The datatime the extension was last modified.", | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.String{ | ||
| stringplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
| "size": schema.Int64Attribute{ | ||
| Description: "The size of the extension file in bytes.", | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.Int64{ | ||
| int64planmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
| // Computed attributes | ||
| "id": schema.StringAttribute{ | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It can lead to the inconsistency error if config is empty. Also it's not needed -
appendcan append tonil.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean if TF configuration doesn't have
config.