Skip to content

Commit

Permalink
Fix inconsistent final plan when labels are added to resources (Googl…
Browse files Browse the repository at this point in the history
  • Loading branch information
kunzese authored and Shourya Singh committed May 25, 2023
1 parent b065487 commit 366f653
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
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
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

0 comments on commit 366f653

Please sign in to comment.