Skip to content

Commit 94d6844

Browse files
authored
Fix non-constant format string in call flex.FmtErrorf after go 1.24 upgrade (#6234)
1 parent f883421 commit 94d6844

19 files changed

+63
-61
lines changed

ibm/service/appconfiguration/data_source_ibm_app_config_environment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func dataSourceIbmAppConfigEnvironmentRead(d *schema.ResourceData, meta interfac
7777

7878
appconfigClient, err := getAppConfigClient(meta, guid)
7979
if err != nil {
80-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
80+
return flex.FmtErrorf("%s", err)
8181
}
8282

8383
options := &appconfigurationv1.GetEnvironmentOptions{}

ibm/service/appconfiguration/data_source_ibm_app_config_environments.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package appconfiguration
55

66
import (
7-
"fmt"
87
"net/url"
98
"reflect"
109
"strconv"
@@ -165,7 +164,7 @@ func dataSourceIbmAppConfigEnvironmentsRead(d *schema.ResourceData, meta interfa
165164

166165
appconfigClient, err := getAppConfigClient(meta, guid)
167166
if err != nil {
168-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
167+
return flex.FmtErrorf("%s", err)
169168
}
170169

171170
options := &appconfigurationv1.ListEnvironmentsOptions{}

ibm/service/appconfiguration/data_source_ibm_app_config_feature.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func dataSourceIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{})
172172

173173
appconfigClient, err := getAppConfigClient(meta, guid)
174174
if err != nil {
175-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
175+
return flex.FmtErrorf("%s", err)
176176
}
177177

178178
options := &appconfigurationv1.GetFeatureOptions{}

ibm/service/appconfiguration/data_source_ibm_app_config_features.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ func dataSourceIbmAppConfigFeaturesRead(d *schema.ResourceData, meta interface{}
282282

283283
appconfigClient, err := getAppConfigClient(meta, guid)
284284
if err != nil {
285-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
285+
return flex.FmtErrorf("%s", err)
286286
}
287287

288288
options := &appconfigurationv1.ListFeaturesOptions{}

ibm/service/appconfiguration/data_source_ibm_app_config_segment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func dataSourceIbmAppConfigSegmentRead(d *schema.ResourceData, meta interface{})
133133

134134
appconfigClient, err := getAppConfigClient(meta, guid)
135135
if err != nil {
136-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
136+
return flex.FmtErrorf("%s", err)
137137
}
138138

139139
options := &appconfigurationv1.GetSegmentOptions{}

ibm/service/appconfiguration/resource_ibm_app_config_collection_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ package appconfiguration_test
55

66
import (
77
"fmt"
8+
"testing"
9+
810
acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
911
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
1012
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1113
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
12-
"testing"
1314

1415
"github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1"
1516
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
@@ -80,11 +81,11 @@ func testAccCheckIbmAppConfigCollectionExists(n string, obj appconfigurationv1.C
8081
}
8182
parts, err := flex.IdParts(rs.Primary.ID)
8283
if err != nil {
83-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
84+
return flex.FmtErrorf("%s", err)
8485
}
8586
appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0])
8687
if err != nil {
87-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
88+
return flex.FmtErrorf("%s", err)
8889
}
8990

9091
options := &appconfigurationv1.GetCollectionOptions{}
@@ -93,7 +94,7 @@ func testAccCheckIbmAppConfigCollectionExists(n string, obj appconfigurationv1.C
9394

9495
result, _, err := appconfigClient.GetCollection(options)
9596
if err != nil {
96-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
97+
return flex.FmtErrorf("%s", err)
9798
}
9899

99100
obj = *result
@@ -109,11 +110,11 @@ func testAccCheckIbmAppConfigCollectionDestroy(s *terraform.State) error {
109110
}
110111
parts, err := flex.IdParts(rs.Primary.ID)
111112
if err != nil {
112-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
113+
return flex.FmtErrorf("%s", err)
113114
}
114115
appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0])
115116
if err != nil {
116-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
117+
return flex.FmtErrorf("%s", err)
117118
}
118119
options := &appconfigurationv1.GetCollectionOptions{}
119120

ibm/service/appconfiguration/resource_ibm_app_config_environment.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func resourceEnvironmentCreate(d *schema.ResourceData, meta interface{}) error {
9090
guid := d.Get("guid").(string)
9191
appconfigClient, err := getAppConfigClient(meta, guid)
9292
if err != nil {
93-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
93+
return flex.FmtErrorf("%s", err)
9494
}
9595
options := &appconfigurationv1.CreateEnvironmentOptions{}
9696

@@ -123,7 +123,7 @@ func resourceEnvironmentUpdate(d *schema.ResourceData, meta interface{}) error {
123123
}
124124
appconfigClient, err := getAppConfigClient(meta, parts[0])
125125
if err != nil {
126-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
126+
return flex.FmtErrorf("%s", err)
127127
}
128128

129129
options := &appconfigurationv1.UpdateEnvironmentOptions{}
@@ -156,7 +156,7 @@ func resourceEnvironmentRead(d *schema.ResourceData, meta interface{}) error {
156156
}
157157
appconfigClient, err := getAppConfigClient(meta, parts[0])
158158
if err != nil {
159-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
159+
return flex.FmtErrorf("%s", err)
160160
}
161161

162162
options := &appconfigurationv1.GetEnvironmentOptions{}
@@ -221,7 +221,7 @@ func resourceEnvironmentDelete(d *schema.ResourceData, meta interface{}) error {
221221

222222
appconfigClient, err := getAppConfigClient(meta, parts[0])
223223
if err != nil {
224-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
224+
return flex.FmtErrorf("%s", err)
225225
}
226226

227227
options := &appconfigurationv1.DeleteEnvironmentOptions{}

ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,20 @@ func testAccCheckIbmAppConfigEnvironmentExists(n string, obj appconfigurationv1.
103103

104104
parts, err := flex.IdParts(rs.Primary.ID)
105105
if err != nil {
106-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
106+
return flex.FmtErrorf("%s", err)
107107
}
108108

109109
appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0])
110110
if err != nil {
111-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
111+
return flex.FmtErrorf("%s", err)
112112
}
113113

114114
options := &appconfigurationv1.GetEnvironmentOptions{}
115115
options.SetEnvironmentID(parts[1])
116116

117117
result, _, err := appconfigClient.GetEnvironment(options)
118118
if err != nil {
119-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
119+
return flex.FmtErrorf("%s", err)
120120
}
121121

122122
obj = *result
@@ -132,12 +132,12 @@ func testAccCheckIbmAppConfigEnvironmentDestroy(s *terraform.State) error {
132132

133133
parts, err := flex.IdParts(rs.Primary.ID)
134134
if err != nil {
135-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
135+
return flex.FmtErrorf("%s", err)
136136
}
137137

138138
appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0])
139139
if err != nil {
140-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
140+
return flex.FmtErrorf("%s", err)
141141
}
142142
options := &appconfigurationv1.GetEnvironmentOptions{}
143143
options.SetEnvironmentID(parts[1])

ibm/service/appconfiguration/resource_ibm_app_config_feature.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func resourceIbmIbmAppConfigFeatureCreate(d *schema.ResourceData, meta interface
166166
guid := d.Get("guid").(string)
167167
appconfigClient, err := getAppConfigClient(meta, guid)
168168
if err != nil {
169-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
169+
return flex.FmtErrorf("%s", err)
170170
}
171171
options := &appconfigurationv1.CreateFeatureOptions{}
172172
options.SetType(d.Get("type").(string))
@@ -197,7 +197,7 @@ func resourceIbmIbmAppConfigFeatureCreate(d *schema.ResourceData, meta interface
197197
value := e.(map[string]interface{})
198198
segmentRulesItem, err := resourceIbmAppConfigFeatureMapToSegmentRule(d, value)
199199
if err != nil {
200-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
200+
return flex.FmtErrorf("%s", err)
201201
}
202202
segmentRules = append(segmentRules, segmentRulesItem)
203203
}
@@ -229,7 +229,7 @@ func resourceIbmIbmAppConfigFeatureUpdate(d *schema.ResourceData, meta interface
229229
}
230230
appconfigClient, err := getAppConfigClient(meta, parts[0])
231231
if err != nil {
232-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
232+
return flex.FmtErrorf("%s", err)
233233
}
234234

235235
options := &appconfigurationv1.UpdateFeatureOptions{}
@@ -259,7 +259,7 @@ func resourceIbmIbmAppConfigFeatureUpdate(d *schema.ResourceData, meta interface
259259
value := e.(map[string]interface{})
260260
segmentRulesItem, err := resourceIbmAppConfigFeatureMapToSegmentRule(d, value)
261261
if err != nil {
262-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
262+
return flex.FmtErrorf("%s", err)
263263
}
264264
segmentRules = append(segmentRules, segmentRulesItem)
265265
}
@@ -291,7 +291,7 @@ func resourceIbmIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{}
291291
}
292292
appconfigClient, err := getAppConfigClient(meta, parts[0])
293293
if err != nil {
294-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
294+
return flex.FmtErrorf("%s", err)
295295
}
296296

297297
options := &appconfigurationv1.GetFeatureOptions{}
@@ -423,7 +423,7 @@ func resourceIbmIbmAppConfigFeatureDelete(d *schema.ResourceData, meta interface
423423
}
424424
appconfigClient, err := getAppConfigClient(meta, parts[0])
425425
if err != nil {
426-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
426+
return flex.FmtErrorf("%s", err)
427427
}
428428

429429
options := &appconfigurationv1.DeleteFeatureOptions{}

ibm/service/appconfiguration/resource_ibm_app_config_feature_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ func testAccCheckIbmAppConfigFeatureExists(n string, obj appconfigurationv1.Feat
9494
}
9595
parts, err := flex.IdParts(rs.Primary.ID)
9696
if err != nil {
97-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
97+
return flex.FmtErrorf("%s", err)
9898
}
9999
appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0])
100100
if err != nil {
101-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
101+
return flex.FmtErrorf("%s", err)
102102
}
103103

104104
options := &appconfigurationv1.GetFeatureOptions{}
@@ -108,7 +108,7 @@ func testAccCheckIbmAppConfigFeatureExists(n string, obj appconfigurationv1.Feat
108108

109109
result, _, err := appconfigClient.GetFeature(options)
110110
if err != nil {
111-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
111+
return flex.FmtErrorf("%s", err)
112112
}
113113

114114
obj = *result
@@ -124,11 +124,11 @@ func testAccCheckIbmAppConfigFeatureDestroy(s *terraform.State) error {
124124
}
125125
parts, err := flex.IdParts(rs.Primary.ID)
126126
if err != nil {
127-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
127+
return flex.FmtErrorf("%s", err)
128128
}
129129
appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0])
130130
if err != nil {
131-
return flex.FmtErrorf(fmt.Sprintf("%s", err))
131+
return flex.FmtErrorf("%s", err)
132132
}
133133
options := &appconfigurationv1.GetFeatureOptions{}
134134

0 commit comments

Comments
 (0)