Skip to content
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

Jump to bottom

Fix inconsistent final plan when labels are added to resources #7923

Merged
merged 1 commit into from
May 12, 2023
Merged

Fix inconsistent final plan when labels are added to resources #7923

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions mmv1/third_party/terraform/resources/resource_dataflow_job.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ func ResourceDataflowJob() *schema.Resource {
"labels": {
Type: schema.TypeMap,
Optional: true,
Computed: true,
DiffSuppressFunc: resourceDataflowJobLabelDiffSuppress,
Description: `User labels to be specified for the job. Keys and values should follow the restrictions specified in the labeling restrictions page. NOTE: Google-provided Dataflow templates often provide default labels that begin with goog-dataflow-provided. Unless explicitly set in config, these labels will be ignored to prevent diffs on re-apply.`,
},
Expand Down
1 change: 1 addition & 0 deletions mmv1/third_party/terraform/resources/resource_storage_bucket.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ func ResourceStorageBucket() *schema.Resource {
"labels": {
Type: schema.TypeMap,
Optional: true,
Computed: true,
// GCP (Dataplex) automatically adds labels
DiffSuppressFunc: resourceDataplexLabelDiffSuppress,
Elem: &schema.Schema{Type: schema.TypeString},
Expand Down