From e86eb6d94c3a990f2c7130238aee347f3a23fd9c Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 6 Mar 2025 17:06:47 -0500 Subject: [PATCH] generators: Use any over interface{} --- internal/generate/common/generator.go | 8 ++++---- internal/generate/listpages/main.go | 2 +- internal/generate/tagresource/resource.tmpl | 8 ++++---- internal/generate/teamcity/services.go | 2 +- internal/service/dynamodb/tag_gen.go | 8 ++++---- internal/service/ec2/tag_gen.go | 8 ++++---- internal/service/ecs/tag_gen.go | 8 ++++---- internal/service/transfer/tag_gen.go | 8 ++++---- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/internal/generate/common/generator.go b/internal/generate/common/generator.go index 1b63cc4868c2..f66ac854dae9 100644 --- a/internal/generate/common/generator.go +++ b/internal/generate/common/generator.go @@ -39,19 +39,19 @@ func (g *Generator) UI() cli.Ui { return g.ui } -func (g *Generator) Infof(format string, a ...interface{}) { +func (g *Generator) Infof(format string, a ...any) { g.ui.Info(fmt.Sprintf(format, a...)) } -func (g *Generator) Warnf(format string, a ...interface{}) { +func (g *Generator) Warnf(format string, a ...any) { g.ui.Warn(fmt.Sprintf(format, a...)) } -func (g *Generator) Errorf(format string, a ...interface{}) { +func (g *Generator) Errorf(format string, a ...any) { g.ui.Error(fmt.Sprintf(format, a...)) } -func (g *Generator) Fatalf(format string, a ...interface{}) { +func (g *Generator) Fatalf(format string, a ...any) { g.Errorf(format, a...) os.Exit(1) } diff --git a/internal/generate/listpages/main.go b/internal/generate/listpages/main.go index f3b5ab8ca2d1..c5d3e8dcbb91 100644 --- a/internal/generate/listpages/main.go +++ b/internal/generate/listpages/main.go @@ -124,7 +124,7 @@ type Generator struct { outputPaginator string } -func (g *Generator) Printf(format string, args ...interface{}) { +func (g *Generator) Printf(format string, args ...any) { fmt.Fprintf(&g.buf, format, args...) } diff --git a/internal/generate/tagresource/resource.tmpl b/internal/generate/tagresource/resource.tmpl index b26a765f76bb..8ed88477bc04 100644 --- a/internal/generate/tagresource/resource.tmpl +++ b/internal/generate/tagresource/resource.tmpl @@ -46,7 +46,7 @@ func resourceTag() *schema.Resource { } } -func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { {{ if not (eq .ServicePackage "ec2") }}// nosemgrep:ci.semgrep.tags.calling-UpdateTags-in-resource-create{{- end }} +func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { {{ if not (eq .ServicePackage "ec2") }}// nosemgrep:ci.semgrep.tags.calling-UpdateTags-in-resource-create{{- end }} var diags diag.Diagnostics conn := meta.(*conns.AWSClient).{{ .AWSServiceUpper }}Client(ctx) @@ -67,7 +67,7 @@ func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta interfa return append(diags, resourceTagRead(ctx, d, meta)...) } -func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).{{ .AWSServiceUpper }}Client(ctx) @@ -95,7 +95,7 @@ func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta interface return diags } -func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).{{ .AWSServiceUpper }}Client(ctx) @@ -111,7 +111,7 @@ func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta interfa return append(diags, resourceTagRead(ctx, d, meta)...) } -func resourceTagDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).{{ .AWSServiceUpper }}Client(ctx) diff --git a/internal/generate/teamcity/services.go b/internal/generate/teamcity/services.go index ff74fa914f26..c22fc8dd5f34 100644 --- a/internal/generate/teamcity/services.go +++ b/internal/generate/teamcity/services.go @@ -145,7 +145,7 @@ func acctestConfigurations(filename string) (map[string]acctestServiceConfig, er return result, nil } -func decodeHclFile(filename string, target interface{}) error { +func decodeHclFile(filename string, target any) error { f, err := os.Open(filename) if err != nil { return err diff --git a/internal/service/dynamodb/tag_gen.go b/internal/service/dynamodb/tag_gen.go index 4d1f2d5c7573..9d509056da99 100644 --- a/internal/service/dynamodb/tag_gen.go +++ b/internal/service/dynamodb/tag_gen.go @@ -46,7 +46,7 @@ func resourceTag() *schema.Resource { } } -func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { // nosemgrep:ci.semgrep.tags.calling-UpdateTags-in-resource-create +func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { // nosemgrep:ci.semgrep.tags.calling-UpdateTags-in-resource-create var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DynamoDBClient(ctx) @@ -63,7 +63,7 @@ func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta interfa return append(diags, resourceTagRead(ctx, d, meta)...) } -func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DynamoDBClient(ctx) @@ -91,7 +91,7 @@ func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta interface return diags } -func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DynamoDBClient(ctx) @@ -107,7 +107,7 @@ func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta interfa return append(diags, resourceTagRead(ctx, d, meta)...) } -func resourceTagDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DynamoDBClient(ctx) diff --git a/internal/service/ec2/tag_gen.go b/internal/service/ec2/tag_gen.go index f4bff2ab104e..891ddfa63ed7 100644 --- a/internal/service/ec2/tag_gen.go +++ b/internal/service/ec2/tag_gen.go @@ -46,7 +46,7 @@ func resourceTag() *schema.Resource { } } -func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).EC2Client(ctx) @@ -63,7 +63,7 @@ func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta interfa return append(diags, resourceTagRead(ctx, d, meta)...) } -func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).EC2Client(ctx) @@ -91,7 +91,7 @@ func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta interface return diags } -func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).EC2Client(ctx) @@ -107,7 +107,7 @@ func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta interfa return append(diags, resourceTagRead(ctx, d, meta)...) } -func resourceTagDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).EC2Client(ctx) diff --git a/internal/service/ecs/tag_gen.go b/internal/service/ecs/tag_gen.go index 75a30d04b85a..e082dbbb3a3d 100644 --- a/internal/service/ecs/tag_gen.go +++ b/internal/service/ecs/tag_gen.go @@ -46,7 +46,7 @@ func resourceTag() *schema.Resource { } } -func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { // nosemgrep:ci.semgrep.tags.calling-UpdateTags-in-resource-create +func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { // nosemgrep:ci.semgrep.tags.calling-UpdateTags-in-resource-create var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ECSClient(ctx) @@ -63,7 +63,7 @@ func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta interfa return append(diags, resourceTagRead(ctx, d, meta)...) } -func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ECSClient(ctx) @@ -91,7 +91,7 @@ func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta interface return diags } -func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ECSClient(ctx) @@ -107,7 +107,7 @@ func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta interfa return append(diags, resourceTagRead(ctx, d, meta)...) } -func resourceTagDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ECSClient(ctx) diff --git a/internal/service/transfer/tag_gen.go b/internal/service/transfer/tag_gen.go index aaf1b341d8ff..d1b8b44fc80a 100644 --- a/internal/service/transfer/tag_gen.go +++ b/internal/service/transfer/tag_gen.go @@ -46,7 +46,7 @@ func resourceTag() *schema.Resource { } } -func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { // nosemgrep:ci.semgrep.tags.calling-UpdateTags-in-resource-create +func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { // nosemgrep:ci.semgrep.tags.calling-UpdateTags-in-resource-create var diags diag.Diagnostics conn := meta.(*conns.AWSClient).TransferClient(ctx) @@ -63,7 +63,7 @@ func resourceTagCreate(ctx context.Context, d *schema.ResourceData, meta interfa return append(diags, resourceTagRead(ctx, d, meta)...) } -func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).TransferClient(ctx) @@ -91,7 +91,7 @@ func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta interface return diags } -func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).TransferClient(ctx) @@ -107,7 +107,7 @@ func resourceTagUpdate(ctx context.Context, d *schema.ResourceData, meta interfa return append(diags, resourceTagRead(ctx, d, meta)...) } -func resourceTagDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceTagDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).TransferClient(ctx)