Skip to content

Commit 2258b22

Browse files
authored
Replace GetTagsUsingCRN with GetGlobalTagsUsingCRN (IBM-Cloud#6248)
We were calling each of these functions about half and half, but they do literally the same thing. We should be calling only one of them for consistency and clarity.
1 parent badf107 commit 2258b22

16 files changed

+16
-16
lines changed

ibm/service/power/data_source_ibm_pi_hosts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func dataSourceIBMPIHostsRead(ctx context.Context, d *schema.ResourceData, meta
163163
}
164164
if host.Crn != "" {
165165
hs[Attr_CRN] = host.Crn
166-
tags, err := flex.GetTagsUsingCRN(meta, string(host.Crn))
166+
tags, err := flex.GetGlobalTagsUsingCRN(meta, string(host.Crn), "", UserTagType)
167167
if err != nil {
168168
log.Printf("Error on get of pi host (%s) user_tags: %s", host.ID, err)
169169
}

ibm/service/power/data_source_ibm_pi_image.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func dataSourceIBMPIImagesRead(ctx context.Context, d *schema.ResourceData, meta
113113
d.Set(Attr_Architecture, imagedata.Specifications.Architecture)
114114
if imagedata.Crn != "" {
115115
d.Set(Attr_CRN, imagedata.Crn)
116-
tags, err := flex.GetTagsUsingCRN(meta, string(imagedata.Crn))
116+
tags, err := flex.GetGlobalTagsUsingCRN(meta, string(imagedata.Crn), "", UserTagType)
117117
if err != nil {
118118
log.Printf("Error on get of pi image (%s) user_tags: %s", *imagedata.ImageID, err)
119119
}

ibm/service/power/data_source_ibm_pi_images.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func flattenStockImages(list []*models.ImageReference, meta interface{}) []map[s
132132
}
133133
if i.Crn != "" {
134134
l[Attr_CRN] = i.Crn
135-
tags, err := flex.GetTagsUsingCRN(meta, string(i.Crn))
135+
tags, err := flex.GetGlobalTagsUsingCRN(meta, string(i.Crn), "", UserTagType)
136136
if err != nil {
137137
log.Printf(
138138
"Error on get of image (%s) user_tags: %s", *i.ImageID, err)

ibm/service/power/data_source_ibm_pi_network_address_group.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func dataSourceIBMPINetworkAddressGroupRead(ctx context.Context, d *schema.Resou
9191
d.SetId(*networkAddressGroup.ID)
9292
if networkAddressGroup.Crn != nil {
9393
d.Set(Attr_CRN, networkAddressGroup.Crn)
94-
userTags, err := flex.GetTagsUsingCRN(meta, string(*networkAddressGroup.Crn))
94+
userTags, err := flex.GetGlobalTagsUsingCRN(meta, string(*networkAddressGroup.Crn), "", UserTagType)
9595
if err != nil {
9696
log.Printf("Error on get of pi network address group (%s) user_tags: %s", nagID, err)
9797
}

ibm/service/power/data_source_ibm_pi_network_address_groups.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func networkAddressGroupsNetworkAddressGroupToMap(networkAddressGroup *models.Ne
117117
nag := make(map[string]interface{})
118118
if networkAddressGroup.Crn != nil {
119119
nag[Attr_CRN] = networkAddressGroup.Crn
120-
userTags, err := flex.GetTagsUsingCRN(meta, string(*networkAddressGroup.Crn))
120+
userTags, err := flex.GetGlobalTagsUsingCRN(meta, string(*networkAddressGroup.Crn), "", UserTagType)
121121
if err != nil {
122122
log.Printf("Error on get of pi network address group (%s) user_tags: %s", *networkAddressGroup.ID, err)
123123
}

ibm/service/power/data_source_ibm_pi_network_interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func dataSourceIBMPINetworkInterfaceRead(ctx context.Context, d *schema.Resource
148148
d.Set(Attr_Status, networkInterface.Status)
149149
if networkInterface.Crn != nil {
150150
d.Set(Attr_CRN, networkInterface.Crn)
151-
userTags, err := flex.GetTagsUsingCRN(meta, string(*networkInterface.Crn))
151+
userTags, err := flex.GetGlobalTagsUsingCRN(meta, string(*networkInterface.Crn), "", UserTagType)
152152
if err != nil {
153153
log.Printf("Error on get of network interface (%s) user_tags: %s", *networkInterface.ID, err)
154154
}

ibm/service/power/data_source_ibm_pi_network_interfaces.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func networkInterfaceToMap(netInterface *models.NetworkInterface, meta interface
163163
interfaceMap[Attr_Status] = netInterface.Status
164164
if netInterface.Crn != nil {
165165
interfaceMap[Attr_CRN] = netInterface.Crn
166-
userTags, err := flex.GetTagsUsingCRN(meta, string(*netInterface.Crn))
166+
userTags, err := flex.GetGlobalTagsUsingCRN(meta, string(*netInterface.Crn), "", UserTagType)
167167
if err != nil {
168168
log.Printf("Error on get of network interface (%s) user_tags: %s", *netInterface.ID, err)
169169
}

ibm/service/power/data_source_ibm_pi_network_security_group.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ func dataSourceIBMPINetworkSecurityGroupRead(ctx context.Context, d *schema.Reso
222222
d.SetId(*networkSecurityGroup.ID)
223223
if networkSecurityGroup.Crn != nil {
224224
d.Set(Attr_CRN, networkSecurityGroup.Crn)
225-
userTags, err := flex.GetTagsUsingCRN(meta, string(*networkSecurityGroup.Crn))
225+
userTags, err := flex.GetGlobalTagsUsingCRN(meta, string(*networkSecurityGroup.Crn), "", UserTagType)
226226
if err != nil {
227227
log.Printf("Error on get of pi network security group (%s) user_tags: %s", *networkSecurityGroup.ID, err)
228228
}

ibm/service/power/data_source_ibm_pi_network_security_groups.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func networkSecurityGroupToMap(nsg *models.NetworkSecurityGroup, meta interface{
247247
networkSecurityGroup := make(map[string]interface{})
248248
if nsg.Crn != nil {
249249
networkSecurityGroup[Attr_CRN] = nsg.Crn
250-
userTags, err := flex.GetTagsUsingCRN(meta, string(*nsg.Crn))
250+
userTags, err := flex.GetGlobalTagsUsingCRN(meta, string(*nsg.Crn), "", UserTagType)
251251
if err != nil {
252252
log.Printf("Error on get of pi network security group (%s) user_tags: %s", *nsg.ID, err)
253253
}

ibm/service/power/data_source_ibm_pi_volume.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ func dataSourceIBMPIVolumeRead(ctx context.Context, d *schema.ResourceData, meta
182182
d.Set(Attr_CreationDate, volumedata.CreationDate.String())
183183
if volumedata.Crn != "" {
184184
d.Set(Attr_CRN, volumedata.Crn)
185-
tags, err := flex.GetTagsUsingCRN(meta, string(volumedata.Crn))
185+
tags, err := flex.GetGlobalTagsUsingCRN(meta, string(volumedata.Crn), "", UserTagType)
186186
if err != nil {
187187
log.Printf("Error on get of pi volume (%s) user_tags: %s", *volumedata.VolumeID, err)
188188
}

0 commit comments

Comments
 (0)