Merge pull request #32192 from hashicorp/td-service-package-factories

Tech debt: Export a factory function for each service package
hashicorp · Jun 23, 2023 · 7c1c5dc · 7c1c5dc
2 parents 4d0bdf0 + cb00d3f
commit 7c1c5dc
Show file tree

Hide file tree

Showing 206 changed files with 1,220 additions and 611 deletions.
diff --git a/internal/generate/servicepackage/file.tmpl b/internal/generate/servicepackage/file.tmpl
@@ -16,6 +16,7 @@ import (
 	{{ .GoV2Package }}_sdkv2 "github.com/aws/aws-sdk-go-v2/service/{{ .GoV2Package }}"
 	{{- end }}
 {{- end }}
+	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/types"
 {{- if ne .ProviderPackage "meta" }}
 	"github.com/hashicorp/terraform-provider-aws/names"
@@ -150,4 +151,6 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 	{{- end }}
 {{- end }}
 
-var ServicePackage = &servicePackage{}
+func ServicePackage(ctx context.Context) conns.ServicePackage {
+	return &servicePackage{}
+}
diff --git a/internal/generate/servicepackages/file.tmpl b/internal/generate/servicepackages/file.tmpl
@@ -12,10 +12,10 @@ import (
 	"golang.org/x/exp/slices"
 )
 
-func servicePackages(context.Context) []conns.ServicePackage {
+func servicePackages(ctx context.Context) []conns.ServicePackage {
 	v := []conns.ServicePackage{
 {{- range .Services }}
-		{{ .ProviderPackage }}.ServicePackage,
+		{{ .ProviderPackage }}.ServicePackage(ctx),
 {{- end }}
 }