8000 Init hooks: Remove default AWS credentials (#11705) · localstack/localstack@a60da92 · GitHub
[go: up one dir, main page]

Skip to content

Commit a60da92

Browse files
Init hooks: Remove default AWS credentials (#11705)
1 parent 73d2dc0 commit a60da92

File tree

1 file changed

+9
-9
lines changed
  • localstack-core/localstack/runtime

1 file changed

+9
-9
lines changed

localstack-core/localstack/runtime/init.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
from plux import Plugin, PluginManager
1313

14-
from localstack import constants
1514
from localstack.runtime import hooks
1615
from localstack.utils.objects import singleton_factory
1716

@@ -156,12 +155,7 @@ def run_stage(self, stage: Stage) -> List[Script]:
156155
for script in scripts:
157156
LOG.debug("Running %s script %s", script.stage, script.path)
158157

159-
# Deprecated: To be removed in v4.0 major release.
160-
# Explicit AWS credentials and region will need to be set in the script.
161158
env_original = os.environ.copy()
162-
os.environ["AWS_ACCESS_KEY_ID"] = constants.DEFAULT_AWS_ACCOUNT_ID
163-
os.environ["AWS_SECRET_ACCESS_KEY"] = constants.INTERNAL_AWS_SECRET_ACCESS_KEY
164-
os.environ["AWS_REGION"] = constants.AWS_REGION_US_EAST_1
165159

166160
try:
167161
script.state = State.RUNNING
@@ -176,13 +170,19 @@ def run_stage(self, stage: Stage) -> List[Script]:
176170
else:
177171
script.state = State.SUCCESSFUL
178172
finally:
179-
# Restore original state of Boto credentials.
180-
for env_var in ("AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_REGION"):
173+
# Discard env variables overridden in startup script that may cause side-effects
174+
for env_var in (
175+
"AWS_ACCESS_KEY_ID",
176+
"AWS_SECRET_ACCESS_KEY",
177+
"AWS_SESSION_TOKEN",
178+
"AWS_DEFAULT_REGION",
179+
"AWS_PROFILE",
180+
"AWS_REGION",
181+
):
181182
if env_var in env_original:
182183
os.environ[env_var] = env_original[env_var]
183184
else:
184185
os.environ.pop(env_var, None)
185-
186186
finally:
187187
self.stage_completed[stage] = True
188188

0 commit comments

Comments
 (0)
0