Generate endpoint resolution for services without generated clients

hashicorp · Jun 20, 2024 · 5f5ad73 · 5f5ad73
1 parent 26a2010
commit 5f5ad73
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/internal/generate/servicepackage/endpoint_resolver.go.gtpl b/internal/generate/servicepackage/endpoint_resolver.go.gtpl
@@ -4,15 +4,12 @@ package {{ .ProviderPackage }}
 
 import (
 	"context"
-{{- if .GenerateClient }}
 	"fmt"
 	"net"
 {{ if .ClientSDKV1 -}}
 	"net/url"
 {{ end }}
-{{ end }}
 
-{{ if .GenerateClient }}
 {{- if .ClientSDKV1 }}
 	endpoints_sdkv1 "github.com/aws/aws-sdk-go/aws/endpoints"
 {{- end }}
@@ -23,10 +20,8 @@ import (
 {{- end }}
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
-{{- end }}
 )
 
-{{- if .GenerateClient }}
 {{ if .ClientSDKV1 }}
 var _ endpoints_sdkv1.Resolver = resolverSDKv1{}
 
@@ -159,4 +154,3 @@ func withBaseEndpoint(endpoint string) func(*{{ .GoV2Package }}_sdkv2.Options) {
 	}
 }
 {{ end }}
-{{ end }}
diff --git a/internal/generate/servicepackage/main.go b/internal/generate/servicepackage/main.go
@@ -101,7 +101,7 @@ func main() {
 			g.Fatalf("generating file (%s): %s", filename, err)
 		}
 
-		if s.GenerateClient {
+		if p != "meta" {
 			g.Infof("Generating internal/service/%s/%s", servicePackage, endpointResolverFilenamne)
 
 			d = g.NewGoFileDestination(endpointResolverFilenamne)