Skip to content

fix: correct ecs environment variable name #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tieske merged 1 commit into from
Sep 26, 2022
Merged

fix: correct ecs environment variable name #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/resty/aws/config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
-- The following environment variables are also read (so only loading this config
-- module in the `init` phase will suffice for most use cases):
--
-- * `ECS_CONTAINERMETADATA_URI_V4`
-- * `ECS_CONTAINERMETADATA_URI`
-- * `ECS_CONTAINER_METADATA_URI_V4`
-- * `ECS_CONTAINER_METADATA_URI`
-- * `AMAZON_ACCESS_KEY_ID`
-- * `AMAZON_SECRET_ACCESS_KEY`
-- * `AMAZON_SESSION_TOKEN`
Expand Down Expand Up @@ -126,8 +126,8 @@ local env_vars = {
-- 'init' phase because envs are not available in later stages)

-- ECS metadata urls
ECS_CONTAINERMETADATA_URI_V4 = { name = "ECS_CONTAINERMETADATA_URI_V4", default = nil },
ECS_CONTAINERMETADATA_URI = { name = "ECS_CONTAINERMETADATA_URI", default = nil },
ECS_CONTAINER_METADATA_URI_V4 = { name = "ECS_CONTAINER_METADATA_URI_V4", default = nil },
ECS_CONTAINER_METADATA_URI = { name = "ECS_CONTAINER_METADATA_URI", default = nil },

-- Variables used in the CredentialProviderChain; EnvironmentCredentials with 'AMAZON' prefix
AMAZON_ACCESS_KEY_ID = { name = "AMAZON_ACCESS_KEY_ID", default = nil },
Expand Down
32 changes: 16 additions & 16 deletions src/resty/aws/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ local global_config = require("resty.aws.config").global
local AWS_REGION = global_config.AWS_REGION
local AWS_DEFAULT_REGION = global_config.AWS_DEFAULT_REGION
local AWS_EC2_METADATA_DISABLED = global_config.AWS_EC2_METADATA_DISABLED
local ECS_CONTAINERMETADATA_URI_V4 = global_config.ECS_CONTAINERMETADATA_URI_V4
local ECS_CONTAINERMETADATA_URI_V3 = global_config.ECS_CONTAINERMETADATA_URI
local ECS_CONTAINERMETADATA_URI_V2 = "http://169.254.170.2/v2/"
local ECS_CONTAINER_METADATA_URI_V4 = global_config.ECS_CONTAINER_METADATA_URI_V4
local ECS_CONTAINER_METADATA_URI_V3 = global_config.ECS_CONTAINER_METADATA_URI
local ECS_CONTAINER_METADATA_URI_V2 = "http://169.254.170.2/v2/"
local IDMS_URI = "http://169.254.169.254"
local METADATA_TIMEOUTS = 5000 -- in milliseconds

Expand Down Expand Up @@ -112,17 +112,17 @@ function Utils.getECSTaskMetadata(subpath, version)
local url
local version = version and version:upper() or "V4"
if version == "V4" then
url = ECS_CONTAINERMETADATA_URI_V4
url = ECS_CONTAINER_METADATA_URI_V4
if not url then
return nil, "ECS metadata url V4 not found in env var ECS_CONTAINERMETADATA_URI_V4"
return nil, "ECS metadata url V4 not found in env var ECS_CONTAINER_METADATA_URI_V4"
end
elseif version == "V3" then
url = ECS_CONTAINERMETADATA_URI_V3
url = ECS_CONTAINER_METADATA_URI_V3
if not url then
return nil, "ECS metadata url V3 not found in env var ECS_CONTAINERMETADATA_URI"
return nil, "ECS metadata url V3 not found in env var ECS_CONTAINER_METADATA_URI"
end
elseif version == "V2" then
url = ECS_CONTAINERMETADATA_URI_V2
url = ECS_CONTAINER_METADATA_URI_V2
if not subpath then
subpath = "/metadata"
end
Expand Down Expand Up @@ -188,8 +188,8 @@ do -- getCurrentRegion
ngx.log(ngx.DEBUG, "no AWS_DEFAULT_REGION env variable")
end

if ECS_CONTAINERMETADATA_URI_V4 then
ngx.log(ngx.DEBUG, "detecting AWS region from ECS_CONTAINERMETADATA_URI_V4 env variable")
if ECS_CONTAINER_METADATA_URI_V4 then
ngx.log(ngx.DEBUG, "detecting AWS region from ECS_CONTAINER_METADATA_URI_V4 env variable")
local metadata, err = Utils.getECSTaskMetadata("/task", "V4")
if not metadata then
ngx.log(ngx.DEBUG, "failed getting ECS metdata V4: ", err)
Expand All @@ -198,11 +198,11 @@ do -- getCurrentRegion
return true
end
else
ngx.log(ngx.DEBUG, "no ECS_CONTAINERMETADATA_URI_V4 env variable")
ngx.log(ngx.DEBUG, "no ECS_CONTAINER_METADATA_URI_V4 env variable")
end

if ECS_CONTAINERMETADATA_URI_V3 then
ngx.log(ngx.DEBUG, "detecting AWS region from ECS_CONTAINERMETADATA_URI env variable")
if ECS_CONTAINER_METADATA_URI_V3 then
ngx.log(ngx.DEBUG, "detecting AWS region from ECS_CONTAINER_METADATA_URI env variable")
local metadata, err = Utils.getECSTaskMetadata("/task", "V3")
if not metadata then
ngx.log(ngx.DEBUG, "failed getting ECS metadata V3: ", err)
Expand All @@ -211,7 +211,7 @@ do -- getCurrentRegion
return true
end
else
ngx.log(ngx.DEBUG, "no ECS_CONTAINERMETADATA_URI env variable")
ngx.log(ngx.DEBUG, "no ECS_CONTAINER_METADATA_URI env variable")
end

if AWS_EC2_METADATA_DISABLED then
Expand Down Expand Up @@ -280,9 +280,9 @@ do -- getCurrentRegion
-- 1. environment variable `AWS_REGION`
-- 2. environment variable `AWS_DEFAULT_REGION`
-- 3. ECS metadata V4 (parse region from "AvailabilityZone") if the environment
-- variable `ECS_CONTAINERMETADATA_URI_V4` is available
-- variable `ECS_CONTAINER_METADATA_URI_V4` is available
-- 4. ECS metadata V3 (parse region from "AvailabilityZone") if the environment
-- variable `ECS_CONTAINERMETADATA_URI` is available
-- variable `ECS_CONTAINER_METADATA_URI` is available
-- 5. IDMSv2 metadata (only if `AWS_EC2_METADATA_DISABLED` hasn't been set to `true`)
--
-- The IDMSv2 call makes a call to an IP endpoint, and hence could timeout
Expand Down