Update name

simonrw · simonrw · commit e611a0ff3df4 · 2023-12-06T15:30:22.000Z
diff --git a/localstack/config.py b/localstack/config.py
@@ -1019,7 +1019,9 @@ def populate_edge_configuration(
 # Comma-separated list of regex patterns for DNS names to resolve locally.
 # Any DNS name not matched against any of the patterns on this whitelist
 # will resolve to the real DNS entry, rather than the local one.
-DNS_SKIP_LOCAL_RESOLUTION = (os.environ.get("DNS_SKIP_LOCAL_RESOLUTION") or "").strip()
+DNS_NAME_PATTERNS_TO_RESOLVE_UPSTREAM = (
+    os.environ.get("DNS_NAME_PATTERNS_TO_RESOLVE_UPSTREAM") or ""
+).strip()
 DNS_LOCAL_NAME_PATTERNS = (os.environ.get("DNS_LOCAL_NAME_PATTERNS") or "").strip()  # deprecated
 
 # IP address that AWS endpoints should resolve to in our local DNS server. By default,
diff --git a/localstack/deprecations.py b/localstack/deprecations.py
@@ -272,7 +272,8 @@ def is_affected(self) -> bool:
     EnvVarDeprecation(
         "DNS_LOCAL_NAME_PATTERNS",
         "3.0.0",
-        "This option was confusingly named. Please use DNS_SKIP_LOCAL_RESOLUTION instead.",
+        "This option was confusingly named. Please use DNS_NAME_PATTERNS_TO_RESOLVE_UPSTREAM "
+        "instead.",
     ),
 ]
 
diff --git a/localstack/dns/server.py b/localstack/dns/server.py
@@ -828,12 +828,12 @@ def start_server(upstream_dns: str, host: str, port: int = config.DNS_PORT):
     if config.LOCALSTACK_HOST.host != LOCALHOST_HOSTNAME:
         dns_server.add_host_pointing_to_localstack(f".*{config.LOCALSTACK_HOST.host}")
 
-    # support both DNS_SKIP_LOCAL_RESOLUTION and DNS_LOCAL_NAME_PATTERNS
+    # support both DNS_NAME_PATTERNS_TO_RESOLVE_UPSTREAM and DNS_LOCAL_NAME_PATTERNS
     # until the next major version change
     # TODO(srw): remove the usage of DNS_LOCAL_NAME_PATTERNS
     skip_local_resolution = " ".join(
         [
-            config.DNS_SKIP_LOCAL_RESOLUTION,
+            config.DNS_NAME_PATTERNS_TO_RESOLVE_UPSTREAM,
             config.DNS_LOCAL_NAME_PATTERNS,
         ]
     ).strip()
diff --git a/tests/bootstrap/test_dns_server.py b/tests/bootstrap/test_dns_server.py
@@ -89,7 +89,7 @@ def test_skip_pattern(
             ContainerConfigurators.network(docker_network),
             ContainerConfigurators.env_vars(
                 {
-                    "DNS_SKIP_LOCAL_RESOLUTION": r".*localhost.localstack.cloud",
+                    "DNS_NAME_PATTERNS_TO_RESOLVE_UPSTREAM": r".*localhost.localstack.cloud",
                 }
             ),
         ]

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,8 @@ def is_affected(self) -> bool:`
`272`	`272`	`EnvVarDeprecation(`
`273`	`273`	`"DNS_LOCAL_NAME_PATTERNS",`
`274`	`274`	`"3.0.0",`
`275`		`- "This option was confusingly named. Please use DNS_SKIP_LOCAL_RESOLUTION instead.",`
	`275`	`+ "This option was confusingly named. Please use DNS_NAME_PATTERNS_TO_RESOLVE_UPSTREAM "`
	`276`	`+ "instead.",`
`276`	`277`	`),`
`277`	`278`	`]`
`278`	`279`
Original file line number	Diff line number	Diff line change
`@@ -828,12 +828,12 @@ def start_server(upstream_dns: str, host: str, port: int = config.DNS_PORT):`
`828`	`828`	`if config.LOCALSTACK_HOST.host != LOCALHOST_HOSTNAME:`
`829`	`829`	`dns_server.add_host_pointing_to_localstack(f".*{config.LOCALSTACK_HOST.host}")`
`830`	`830`
`831`		`- # support both DNS_SKIP_LOCAL_RESOLUTION and DNS_LOCAL_NAME_PATTERNS`
	`831`	`+ # support both DNS_NAME_PATTERNS_TO_RESOLVE_UPSTREAM and DNS_LOCAL_NAME_PATTERNS`
`832`	`832`	`# until the next major version change`
`833`	`833`	`# TODO(srw): remove the usage of DNS_LOCAL_NAME_PATTERNS`
`834`	`834`	`skip_local_resolution = " ".join(`
`835`	`835`	`[`
`836`		`- config.DNS_SKIP_LOCAL_RESOLUTION,`
	`836`	`+ config.DNS_NAME_PATTERNS_TO_RESOLVE_UPSTREAM,`
`837`	`837`	`config.DNS_LOCAL_NAME_PATTERNS,`
`838`	`838`	`]`
`839`	`839`	`).strip()`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ def test_skip_pattern(`
`89`	`89`	`ContainerConfigurators.network(docker_network),`
`90`	`90`	`ContainerConfigurators.env_vars(`
`91`	`91`	`{`
`92`		`- "DNS_SKIP_LOCAL_RESOLUTION": r".*localhost.localstack.cloud",`
	`92`	`+ "DNS_NAME_PATTERNS_TO_RESOLVE_UPSTREAM": r".*localhost.localstack.cloud",`
`93`	`93`	`}`
`94`	`94`	`),`
`95`	`95`	`]`