Skip to content

デバッグ文を消したプルリク #1

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

Open
scacyba wants to merge 1 commit into
base: main
Choose a base branch
from
Open

デバッグ文を消したプルリク #1

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
12 changes: 0 additions & 12 deletions check-ecs-exec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,6 @@ else

## Optional Permissions (Might be required if audit-logging is enabled)
### KMS
echo "kmsKeyId:${kmsKeyId}" #==========================================================
if [[ ! "${kmsKeyId}" = "null" ]]; then
printf "${COLOR_DEFAULT} -----\n"
kmsDecrypt="kms:Decrypt"
Expand All @@ -566,7 +565,6 @@ echo "kmsKeyId:${kmsKeyId}" #==================================================
showEvalResult "${kmsEvalResult}" "${kmsDecrypt}"
fi
### S3 Bucket
echo "s3BucketName:${s3BucketName}" #==========================================================
if [[ ! "${s3BucketName}" = "null" ]]; then
printf "${COLOR_DEFAULT} -----\n"
s3PutObject="s3:PutObject"
Expand Down Expand Up @@ -596,7 +594,6 @@ echo "s3BucketName:${s3BucketName}" #==========================================
fi
fi
### CloudWatch Logs
echo "cloudWatchLogGroupName:${cloudWatchLogGroupName}" #==========================================================
if [[ ! "${cloudWatchLogGroupName}" = "null" ]]; then
printf "${COLOR_DEFAULT} -----\n"
# For Resource "*"
Expand Down Expand Up @@ -630,27 +627,18 @@ fi
# If there is any VPC Endpoints configured for the task VPC, we assume you would need an additional SSM PrivateLink to be configured. (yellow)
# TODO: In the ideal world, the script should simply check if the task can reach to the internet or not :)
requiredEndpoint="com.amazonaws.${AWS_REGION}.ssmmessages"
echo "describedTaskJson:${describedTaskJson}" #==========================================================
#taskNetworkingAttachment=$(echo "${describedTaskJson}" | jq -r ".tasks[0].attachments[0]")
taskNetworkingAttachment=$(echo "${describedTaskJson}" | jq -r ".tasks[0].attachments[] | select(.type==\"ElasticNetworkInterface\")")
echo "taskNetworkingAttachment:${taskNetworkingAttachment}" #==========================================================
if [[ "${taskNetworkingAttachment}" = "null" ]]; then
## bridge/host networking (only for EC2)
taskVpcId=$(echo "${describedContainerInstanceJson}" | jq -r ".containerInstances[0].attributes[] | select(.name==\"ecs.vpc-id\") | .value")
taskSubnetId=$(echo "${describedContainerInstanceJson}" | jq -r ".containerInstances[0].attributes[] | select(.name==\"ecs.subnet-id\") | .value")
subnetJson=$(${AWS_CLI_BIN} ec2 describe-subnets --subnet-ids "${taskSubnetId}")
else
## awsvpc networking (for both EC2 and Fargate)
echo "describedTaskJson:${describedTaskJson}" #==========================================================
# taskSubnetId=$(echo "${describedTaskJson}" | jq -r ".tasks[0].attachments[0].details[] | select(.name==\"subnetId\") | .value")
taskSubnetId=$(echo "${describedTaskJson}" | jq -r ".tasks[0].attachments[] | select(.type==\"ElasticNetworkInterface\") | .details[] | select(.name==\"subnetId\") | .value")
echo "taskSubnetId:${taskSubnetId}" #==========================================================
subnetJson=$(${AWS_CLI_BIN} ec2 describe-subnets --subnet-ids "${taskSubnetId}")
echo "subnetJson:${subnetJson}" #==========================================================
taskVpcId=$(echo "${subnetJson}" | jq -r ".Subnets[0].VpcId")
echo "taskVpcId:${taskVpcId}" #==========================================================
fi

## Obtain the ownerID of subnet's owner to check if the subnet is shared via AWS RAM (which check-ecs-exec.sh doesn't support today)
subnetOwnerId=$(echo "${subnetJson}" | jq -r ".Subnets[0].OwnerId")
printf "${COLOR_DEFAULT} VPC Endpoints | "
Expand Down