Skip to content

Commit bbcdc4c

Browse files
Add support for description to tag template fields (#8810) (#4650) (#3128)
Co-authored-by: Geir Sagberg <[email protected]> Signed-off-by: Modular Magician <[email protected]> Co-authored-by: Geir Sagberg <[email protected]>
1 parent 217cf86 commit bbcdc4c

File tree

3 files changed

+28
-0
lines changed

3 files changed

+28
-0
lines changed

.changelog/4650.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
datacatalog: added `description` field to `google_data_catalog_tag_template ` resource
3+
```

google-beta/resource_data_catalog_tag_template.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ Can have up to 500 allowed values.`,
9696
},
9797
},
9898
},
99+
"description": {
100+
Type: schema.TypeString,
101+
Optional: true,
102+
Description: `A description for this field.`,
103+
},
99104
"display_name": {
100105
Type: schema.TypeString,
101106
Optional: true,
@@ -429,6 +434,7 @@ func flattenDataCatalogTagTemplateFields(v interface{}, d *schema.ResourceData,
429434
"field_id": k,
430435
"name": flattenDataCatalogTagTemplateFieldsName(original["name"], d, config),
431436
"display_name": flattenDataCatalogTagTemplateFieldsDisplayName(original["displayName"], d, config),
437+
"description": flattenDataCatalogTagTemplateFieldsDescription(original["description"], d, config),
432438
"type": flattenDataCatalogTagTemplateFieldsType(original["type"], d, config),
433439
"is_required": flattenDataCatalogTagTemplateFieldsIsRequired(original["isRequired"], d, config),
434440
"order": flattenDataCatalogTagTemplateFieldsOrder(original["order"], d, config),
@@ -444,6 +450,10 @@ func flattenDataCatalogTagTemplateFieldsDisplayName(v interface{}, d *schema.Res
444450
return v
445451
}
446452

453+
func flattenDataCatalogTagTemplateFieldsDescription(v interface{}, d *schema.ResourceData, config *Config) interface{} {
454+
return v
455+
}
456+
447457
func flattenDataCatalogTagTemplateFieldsType(v interface{}, d *schema.ResourceData, config *Config) interface{} {
448458
if v == nil {
449459
return nil
@@ -546,6 +556,13 @@ func expandDataCatalogTagTemplateFields(v interface{}, d TerraformResourceData,
546556
transformed["displayName"] = transformedDisplayName
547557
}
548558

559+
transformedDescription, err := expandDataCatalogTagTemplateFieldsDescription(original["description"], d, config)
560+
if err != nil {
561+
return nil, err
562+
} else if val := reflect.ValueOf(transformedDescription); val.IsValid() && !isEmptyValue(val) {
563+
transformed["description"] = transformedDescription
564+
}
565+
549566
transformedType, err := expandDataCatalogTagTemplateFieldsType(original["type"], d, config)
550567
if err != nil {
551568
return nil, err
@@ -584,6 +601,10 @@ func expandDataCatalogTagTemplateFieldsDisplayName(v interface{}, d TerraformRes
584601
return v, nil
585602
}
586603

604+
func expandDataCatalogTagTemplateFieldsDescription(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
605+
return v, nil
606+
}
607+
587608
func expandDataCatalogTagTemplateFieldsType(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
588609
l := v.([]interface{})
589610
if len(l) == 0 || l[0] == nil {

website/docs/r/data_catalog_tag_template.html.markdown

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ The `fields` block supports:
111111
(Optional)
112112
The display name for this field.
113113

114+
* `description` -
115+
(Optional)
116+
A description for this field.
117+
114118
* `type` -
115119
(Required)
116120
The type of value this tag field can contain.

0 commit comments

Comments
 (0)