Skip to content

Commit 5dc741f

Browse files
ansgarmansgarm
authored
fix golangci-lint by running 'golangci-lint run --fix' (#616)
1 parent cc19b99 commit 5dc741f

File tree

4 files changed

+39
-39
lines changed

4 files changed

+39
-39
lines changed

‎helper/resource/testcase_providers.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@ func (c TestCase) providerConfig(_ context.Context, skipProviderBlock bool) stri
2020
// is being used and not the others, but leaving it here just in case
2121
// it does have a special purpose that wasn't being unit tested prior.
2222
for name := range c.Providers {
23-
providerBlocks.WriteString(fmt.Sprintf("provider %q {}\n", name))
23+
fmt.Fprintf(&providerBlocks, "provider %q {}\n", name)
2424
}
2525

2626
for name, externalProvider := range c.ExternalProviders {
2727
if !skipProviderBlock {
28-
providerBlocks.WriteString(fmt.Sprintf("provider %q {}\n", name))
28+
fmt.Fprintf(&providerBlocks, "provider %q {}\n", name)
2929
}
3030

3131
if externalProvider.Source == "" && externalProvider.VersionConstraint == "" {
3232
continue
3333
}
3434

35-
requiredProviderBlocks.WriteString(fmt.Sprintf(" %s = {\n", name))
35+
fmt.Fprintf(&requiredProviderBlocks, " %s = {\n", name)
3636

3737
if externalProvider.Source != "" {
38-
requiredProviderBlocks.WriteString(fmt.Sprintf(" source = %q\n", externalProvider.Source))
38+
fmt.Fprintf(&requiredProviderBlocks, " source = %q\n", externalProvider.Source)
3939
}
4040

4141
if externalProvider.VersionConstraint != "" {
42-
requiredProviderBlocks.WriteString(fmt.Sprintf(" version = %q\n", externalProvider.VersionConstraint))
42+
fmt.Fprintf(&requiredProviderBlocks, " version = %q\n", externalProvider.VersionConstraint)
4343
}
4444

4545
requiredProviderBlocks.WriteString(" }\n")

‎helper/resource/testing_new_import_state.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -423,11 +423,11 @@ func appendImportBlock(config teststep.Config, resourceName string, importID str
423423

424424
func appendImportBlockWithIdentity(config teststep.Config, resourceName string, identityValues map[string]any) teststep.Config {
425425
configBuilder := strings.Builder{}
426-
configBuilder.WriteString(fmt.Sprintf(``+"\n"+
426+
fmt.Fprintf(&configBuilder, ``+"\n"+
427427
`import {`+"\n"+
428428
` to = %s`+"\n"+
429429
` identity = {`+"\n",
430-
resourceName))
430+
resourceName)
431431

432432
for k, v := range identityValues {
433433
// It's valid for identity attributes to be null, we can just omit it from config
@@ -437,20 +437,20 @@ func appendImportBlockWithIdentity(config teststep.Config, resourceName string,
437437

438438
switch v := v.(type) {
439439
case bool:
440-
configBuilder.WriteString(fmt.Sprintf(` %q = %t`+"\n", k, v))
440+
fmt.Fprintf(&configBuilder, ` %q = %t`+"\n", k, v)
441441

442442
case []any:
443443
var quotedV []string
444444
for _, v := range v {
445445
quotedV = append(quotedV, fmt.Sprintf(`%q`, v))
446446
}
447-
configBuilder.WriteString(fmt.Sprintf(` %q = [%s]`+"\n", k, strings.Join(quotedV, ", ")))
447+
fmt.Fprintf(&configBuilder, ` %q = [%s]`+"\n", k, strings.Join(quotedV, ", "))
448448

449449
case json.Number:
450-
configBuilder.WriteString(fmt.Sprintf(` %q = %s`+"\n", k, v))
450+
fmt.Fprintf(&configBuilder, ` %q = %s`+"\n", k, v)
451451

452452
case string:
453-
configBuilder.WriteString(fmt.Sprintf(` %q = %q`+"\n", k, v))
453+
fmt.Fprintf(&configBuilder, ` %q = %q`+"\n", k, v)
454454

455455
default:
456456
panic(fmt.Sprintf("unexpected type %T for identity value %q", v, k))

‎helper/resource/teststep_providers.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,21 @@ func (s TestStep) providerConfig(_ context.Context, skipProviderBlock bool, tfVe
7171

7272
for name, externalProvider := range s.ExternalProviders {
7373
if !skipProviderBlock {
74-
providerBlocks.WriteString(fmt.Sprintf("provider %q {}\n", name))
74+
fmt.Fprintf(&providerBlocks, "provider %q {}\n", name)
7575
}
7676

7777
if externalProvider.Source == "" && externalProvider.VersionConstraint == "" {
7878
continue
7979
}
8080

81-
requiredProviderBlocks.WriteString(fmt.Sprintf(" %s = {\n", name))
81+
fmt.Fprintf(&requiredProviderBlocks, " %s = {\n", name)
8282

8383
if externalProvider.Source != "" {
84-
requiredProviderBlocks.WriteString(fmt.Sprintf(" source = %q\n", externalProvider.Source))
84+
fmt.Fprintf(&requiredProviderBlocks, " source = %q\n", externalProvider.Source)
8585
}
8686

8787
if externalProvider.VersionConstraint != "" {
88-
requiredProviderBlocks.WriteString(fmt.Sprintf(" version = %q\n", externalProvider.VersionConstraint))
88+
fmt.Fprintf(&requiredProviderBlocks, " version = %q\n", externalProvider.VersionConstraint)
8989
}
9090

9191
requiredProviderBlocks.WriteString(" }\n")
@@ -154,30 +154,30 @@ func (s TestStep) providerConfigTestCase(_ context.Context, skipProviderBlock bo
154154
// is being used and not the others, but leaving it here just in case
155155
// it does have a special purpose that wasn't being unit tested prior.
156156
for name := range providerNames {
157-
providerBlocks.WriteString(fmt.Sprintf("provider %q {}\n", name))
157+
fmt.Fprintf(&providerBlocks, "provider %q {}\n", name)
158158

159-
requiredProviderBlocks.WriteString(fmt.Sprintf(" %s = {\n", name))
159+
fmt.Fprintf(&requiredProviderBlocks, " %s = {\n", name)
160160

161161
requiredProviderBlocks.WriteString(" }\n")
162162
}
163163

164164
for name, externalProvider := range testCase.ExternalProviders {
165165
if !skipProviderBlock {
166-
providerBlocks.WriteString(fmt.Sprintf("provider %q {}\n", name))
166+
fmt.Fprintf(&providerBlocks, "provider %q {}\n", name)
167167
}
168168

169169
if externalProvider.Source == "" && externalProvider.VersionConstraint == "" {
170170
continue
171171
}
172172

173-
requiredProviderBlocks.WriteString(fmt.Sprintf(" %s = {\n", name))
173+
fmt.Fprintf(&requiredProviderBlocks, " %s = {\n", name)
174174

175175
if externalProvider.Source != "" {
176-
requiredProviderBlocks.WriteString(fmt.Sprintf(" source = %q\n", externalProvider.Source))
176+
fmt.Fprintf(&requiredProviderBlocks, " source = %q\n", externalProvider.Source)
177177
}
178178

179179
if externalProvider.VersionConstraint != "" {
180-
requiredProviderBlocks.WriteString(fmt.Sprintf(" version = %q\n", externalProvider.VersionConstraint))
180+
fmt.Fprintf(&requiredProviderBlocks, " version = %q\n", externalProvider.VersionConstraint)
181181
}
182182

183183
requiredProviderBlocks.WriteString(" }\n")
@@ -250,8 +250,8 @@ func addTerraformBlockSource(name, config string) string {
250250

251251
var providerBlocks strings.Builder
252252

253-
providerBlocks.WriteString(fmt.Sprintf(" %s = {\n", name))
254-
providerBlocks.WriteString(fmt.Sprintf(" source = %q\n", getProviderAddr(name)))
253+
fmt.Fprintf(&providerBlocks, " %s = {\n", name)
254+
fmt.Fprintf(&providerBlocks, " source = %q\n", getProviderAddr(name))
255255
providerBlocks.WriteString(" }\n")
256256

257257
return providerBlocks.String()

‎terraform/state.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ func (s *State) String() string {
803803
continue
804804
}
805805

806-
buf.WriteString(fmt.Sprintf("module.%s:\n", strings.Join(m.Path[1:], ".")))
806+
fmt.Fprintf(&buf, "module.%s:\n", strings.Join(m.Path[1:], "."))
807807

808808
s := bufio.NewScanner(strings.NewReader(mStr))
809809
for s.Scan() {
@@ -812,7 +812,7 @@ func (s *State) String() string {
812812
text = " " + text
813813
}
814814

815-
buf.WriteString(fmt.Sprintf("%s\n", text))
815+
fmt.Fprintf(&buf, "%s\n", text)
816816
}
817817
}
818818

@@ -1130,10 +1130,10 @@ func (m *ModuleState) String() string {
11301130
deposedStr = fmt.Sprintf(" (%d deposed)", len(rs.Deposed))
11311131
}
11321132

1133-
buf.WriteString(fmt.Sprintf("%s:%s%s\n", k, taintStr, deposedStr))
1134-
buf.WriteString(fmt.Sprintf(" ID = %s\n", id))
1133+
fmt.Fprintf(&buf, "%s:%s%s\n", k, taintStr, deposedStr)
1134+
fmt.Fprintf(&buf, " ID = %s\n", id)
11351135
if rs.Provider != "" {
1136-
buf.WriteString(fmt.Sprintf(" provider = %s\n", rs.Provider))
1136+
fmt.Fprintf(&buf, " provider = %s\n", rs.Provider)
11371137
}
11381138

11391139
var attributes map[string]string
@@ -1153,21 +1153,21 @@ func (m *ModuleState) String() string {
11531153

11541154
for _, ak := range attrKeys {
11551155
av := attributes[ak]
1156-
buf.WriteString(fmt.Sprintf(" %s = %s\n", ak, av))
1156+
fmt.Fprintf(&buf, " %s = %s\n", ak, av)
11571157
}
11581158

11591159
for idx, t := range rs.Deposed {
11601160
taintStr := ""
11611161
if t.Tainted {
11621162
taintStr = " (tainted)"
11631163
}
1164-
buf.WriteString(fmt.Sprintf(" Deposed ID %d = %s%s\n", idx+1, t.ID, taintStr))
1164+
fmt.Fprintf(&buf, " Deposed ID %d = %s%s\n", idx+1, t.ID, taintStr)
11651165
}
11661166

11671167
if len(rs.Dependencies) > 0 {
11681168
buf.WriteString("\n Dependencies:\n")
11691169
for _, dep := range rs.Dependencies {
1170-
buf.WriteString(fmt.Sprintf(" %s\n", dep))
1170+
fmt.Fprintf(&buf, " %s\n", dep)
11711171
}
11721172
}
11731173
}
@@ -1186,9 +1186,9 @@ func (m *ModuleState) String() string {
11861186
v := m.Outputs[k]
11871187
switch vTyped := v.Value.(type) {
11881188
case string:
1189-
buf.WriteString(fmt.Sprintf("%s = %s\n", k, vTyped))
1189+
fmt.Fprintf(&buf, "%s = %s\n", k, vTyped)
11901190
case []interface{}:
1191-
buf.WriteString(fmt.Sprintf("%s = %s\n", k, vTyped))
1191+
fmt.Fprintf(&buf, "%s = %s\n", k, vTyped)
11921192
case map[string]interface{}:
11931193
var mapKeys []string
11941194
for key := range vTyped {
@@ -1199,11 +1199,11 @@ func (m *ModuleState) String() string {
11991199
var mapBuf bytes.Buffer
12001200
mapBuf.WriteString("{")
12011201
for _, key := range mapKeys {
1202-
mapBuf.WriteString(fmt.Sprintf("%s:%s ", key, vTyped[key]))
1202+
fmt.Fprintf(&mapBuf, "%s:%s ", key, vTyped[key])
12031203
}
12041204
mapBuf.WriteString("}")
12051205

1206-
buf.WriteString(fmt.Sprintf("%s = %s\n", k, mapBuf.String()))
1206+
fmt.Fprintf(&buf, "%s = %s\n", k, mapBuf.String())
12071207
}
12081208
}
12091209
}
@@ -1438,7 +1438,7 @@ func (s *ResourceState) String() string {
14381438
defer s.Unlock()
14391439

14401440
var buf bytes.Buffer
1441-
buf.WriteString(fmt.Sprintf("Type = %s", s.Type))
1441+
fmt.Fprintf(&buf, "Type = %s", s.Type)
14421442
return buf.String()
14431443
}
14441444

@@ -1748,7 +1748,7 @@ func (s *InstanceState) String() string {
17481748
return notCreated
17491749
}
17501750

1751-
buf.WriteString(fmt.Sprintf("ID = %s\n", s.ID))
1751+
fmt.Fprintf(&buf, "ID = %s\n", s.ID)
17521752

17531753
attributes := s.Attributes
17541754
attrKeys := make([]string, 0, len(attributes))
@@ -1763,10 +1763,10 @@ func (s *InstanceState) String() string {
17631763

17641764
for _, ak := range attrKeys {
17651765
av := attributes[ak]
1766-
buf.WriteString(fmt.Sprintf("%s = %s\n", ak, av))
1766+
fmt.Fprintf(&buf, "%s = %s\n", ak, av)
17671767
}
17681768

1769-
buf.WriteString(fmt.Sprintf("Tainted = %t\n", s.Tainted))
1769+
fmt.Fprintf(&buf, "Tainted = %t\n", s.Tainted)
17701770

17711771
return buf.String()
17721772
}

0 commit comments

Comments
 (0)