moto/tests/terraformtests/etc/0001-Patch-Hardcode-endpoints-to-local-server.patch
2023-08-21 20:33:16 +00:00

62 lines
2.7 KiB
Diff

From 83f8df495c5fc187d925a7dd61f93d1fdc4f405b Mon Sep 17 00:00:00 2001
From: Bert Blommers <info@bertblommers.nl>
Date: Sun, 13 Aug 2023 21:16:30 +0000
Subject: [PATCH] Patch endpoints to localhost:4566
---
internal/conns/config.go | 14 ++++++++++++++
internal/provider/provider.go | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/internal/conns/config.go b/internal/conns/config.go
index 72c9cabde0..1f2e0d00e9 100644
--- a/internal/conns/config.go
+++ b/internal/conns/config.go
@@ -55,10 +55,24 @@ type Config struct {
UseFIPSEndpoint bool
}
+// XXX: added by bblommers
+func GetLocalEndpoints() map[string]string {
+ const localEndpoint = "http://localhost:4566"
+ var localEndpoints = map[string]string{}
+ for _, name := range names.Aliases() {
+ localEndpoints[name] = localEndpoint
+ }
+ return localEndpoints
+}
+
// ConfigureProvider configures the provided provider Meta (instance data).
func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWSClient, diag.Diagnostics) {
var diags diag.Diagnostics
+ // XXX: added by bblommers
+ // insert custom endpoints
+ c.Endpoints = GetLocalEndpoints()
+
awsbaseConfig := awsbase.Config{
AccessKey: c.AccessKey,
APNInfo: StdUserAgentProducts(c.TerraformVersion),
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 88c6ea9538..cfe78c5549 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -452,13 +452,13 @@ func configure(ctx context.Context, provider *schema.Provider, d *schema.Resourc
CustomCABundle: d.Get("custom_ca_bundle").(string),
EC2MetadataServiceEndpoint: d.Get("ec2_metadata_service_endpoint").(string),
EC2MetadataServiceEndpointMode: d.Get("ec2_metadata_service_endpoint_mode").(string),
- Endpoints: make(map[string]string),
+ Endpoints: conns.GetLocalEndpoints(), // XXX: added by bblommers
HTTPProxy: d.Get("http_proxy").(string),
Insecure: d.Get("insecure").(bool),
MaxRetries: 25, // Set default here, not in schema (muxing with v6 provider).
Profile: d.Get("profile").(string),
Region: d.Get("region").(string),
- S3UsePathStyle: d.Get("s3_use_path_style").(bool),
+ S3UsePathStyle: true,
SecretKey: d.Get("secret_key").(string),
SkipCredsValidation: d.Get("skip_credentials_validation").(bool),
SkipRegionValidation: d.Get("skip_region_validation").(bool),
--
2.25.1