merge: Sync changes from qa to main #1418
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| allowRemediationCommits: | ||
| individual: true | ||
| thirdParty: true | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -19,11 +19,12 @@ AFJ_VERSION=${14} | |||||
| INDY_LEDGER=${15} | ||||||
| INBOUND_ENDPOINT=${16} | ||||||
| SCHEMA_FILE_SERVER_URL=${17} | ||||||
| AGENT_API_KEY=${18} | ||||||
| AGENT_HOST=${19} | ||||||
| AWS_ACCOUNT_ID=${20} | ||||||
| S3_BUCKET_ARN=${21} | ||||||
| CLUSTER_NAME=${22} | ||||||
| TASKDEFINITION_FAMILY=${23} | ||||||
|
|
||||||
| DESIRED_COUNT=1 | ||||||
|
|
||||||
|
|
@@ -37,7 +38,7 @@ random_string=$(generate_random_string) | |||||
| # Print the generated random string | ||||||
| echo "Random String: $random_string" | ||||||
|
|
||||||
| SERVICE_NAME="${CONTAINER_NAME}-service" | ||||||
| EXTERNAL_IP=$(echo "$2" | tr -d '[:space:]') | ||||||
| ADMIN_PORT_FILE="$PWD/agent-provisioning/AFJ/port-file/last-admin-port.txt" | ||||||
| INBOUND_PORT_FILE="$PWD/agent-provisioning/AFJ/port-file/last-inbound-port.txt" | ||||||
|
|
@@ -153,7 +154,7 @@ CONTAINER_DEFINITIONS=$( | |||||
| [ | ||||||
| { | ||||||
| "name": "$CONTAINER_NAME", | ||||||
| "image": "${AFJ_VERSION}", | ||||||
| "cpu": 154, | ||||||
|
||||||
| "memory": 307, | ||||||
| "portMappings": [ | ||||||
|
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainImage reference may be incomplete
🏁 Script executed: #!/bin/bash
echo "AFJ_VERSION=${AFJ_VERSION:-unset}"
# Expected format: <account>.dkr.ecr.<region>.amazonaws.com/<repo>:<tag>Length of output: 42 AFJ_VERSION is unset, causing incomplete image reference 🤖 Prompt for AI Agents |
||||||
|
|
@@ -194,6 +195,14 @@ CONTAINER_DEFINITIONS=$( | |||||
| } | ||||||
| ], | ||||||
| "volumesFrom": [], | ||||||
| "logConfiguration": { | ||||||
| "logDriver": "awslogs", | ||||||
| "options": { | ||||||
| "awslogs-group": "/ecs/$TASKDEFINITION_FAMILY", | ||||||
| "awslogs-create-group": "true", | ||||||
| "awslogs-region": "$AWS_PUBLIC_REGION", | ||||||
| "awslogs-stream-prefix": "ecs" | ||||||
| }, | ||||||
| "ulimits": [] | ||||||
| } | ||||||
| ] | ||||||
|
|
@@ -204,7 +213,7 @@ EOF | |||||
| TASK_DEFINITION=$( | ||||||
| cat <<EOF | ||||||
| { | ||||||
| "family": "$TASKDEFINITION_FAMILY", | ||||||
| "containerDefinitions": $CONTAINER_DEFINITIONS, | ||||||
| "executionRoleArn": "arn:aws:iam::${AWS_ACCOUNT_ID}:role/ecsTaskExecutionRole", | ||||||
| "volumes": [ | ||||||
|
|
@@ -262,6 +271,63 @@ if [ $? -eq 0 ]; then | |||||
| sleep 10 | ||||||
| fi | ||||||
| done | ||||||
| # Describe the ECS service and filter by service name | ||||||
| service_description=$(aws ecs describe-services --service $SERVICE_NAME --cluster $CLUSTER_NAME --region $AWS_PUBLIC_REGION) | ||||||
|
There was a problem hiding this comment. Use --services (plural) in aws ecs describe-services CLI requires “--services”. -service_description=$(aws ecs describe-services --service $SERVICE_NAME --cluster $CLUSTER_NAME --region $AWS_PUBLIC_REGION)
+service_description=$(aws ecs describe-services --services "$SERVICE_NAME" --cluster "$CLUSTER_NAME" --region "$AWS_PUBLIC_REGION")📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||
| echo "service_description=$service_description" | ||||||
|
|
||||||
|
|
||||||
| # Extract Task ID from the service description events | ||||||
| task_id=$(echo "$service_description" | jq -r '.services[0].events[] | select(.message | test("has started 1 tasks")) | .message | capture("\\(task (?<id>[^)]+)\\)") | .id') | ||||||
| #echo "task_id=$task_id" | ||||||
|
|
||||||
| # to fetch log group of container | ||||||
| ............................................................. | ||||||
| log_group=/ecs/$TASKDEFINITION_FAMILY | ||||||
| echo "log_group=$log_group" | ||||||
|
|
||||||
| # Get Log Stream Name | ||||||
| log_stream=ecs/$CONTAINER_NAME/$task_id | ||||||
|
|
||||||
| echo "logstrem=$log_stream" | ||||||
|
|
||||||
| # Check if the token folder exists, and create it if it doesn't | ||||||
| token_folder="$PWD/agent-provisioning/AFJ/token" | ||||||
| if [ ! -d "$token_folder" ]; then | ||||||
| mkdir -p "$token_folder" | ||||||
| fi | ||||||
|
|
||||||
| # Set maximum retry attempts | ||||||
| RETRIES=3 | ||||||
|
|
||||||
| # Loop to attempt retrieving token from logs | ||||||
| # Loop to attempt retrieving token from logs | ||||||
| for attempt in $(seq 1 $RETRIES); do | ||||||
| echo "Attempt $attempt: Checking service logs for token..." | ||||||
|
|
||||||
| # Fetch logs and grep for API token | ||||||
| token=$(aws logs get-log-events \ | ||||||
| --log-group-name "$log_group" \ | ||||||
| --log-stream-name "$log_stream" \ | ||||||
| --region $AWS_PUBLIC_REGION \ | ||||||
| | grep -o '*** API Key: [^ ]*' \ | ||||||
| | cut -d ' ' -f 3 | ||||||
| ) | ||||||
| # echo "token=$token" | ||||||
| if [ -n "$token" ]; then | ||||||
| echo "Token found: $token" | ||||||
| # Write token to a file | ||||||
| echo "{\"token\": \"$token\"}" > "$PWD/agent-provisioning/AFJ/token/${AGENCY}_${CONTAINER_NAME}.json" | ||||||
| break # Exit loop if token is found | ||||||
| else | ||||||
| echo "Token not found in logs. Retrying..." | ||||||
| if [ $attempt -eq $RETRIES ]; then | ||||||
| echo "Reached maximum retry attempts. Token not found." | ||||||
| fi | ||||||
| fi | ||||||
| # Add a delay of 10 seconds between retries | ||||||
| sleep 10 | ||||||
| done | ||||||
|
|
||||||
|
|
||||||
| echo "Creating agent config" | ||||||
| cat <<EOF >${PWD}/agent-provisioning/AFJ/endpoints/${AGENCY}_${CONTAINER_NAME}.json | ||||||
|
|
@@ -273,7 +339,7 @@ EOF | |||||
|
|
||||||
| cat <<EOF >${PWD}/agent-provisioning/AFJ/token/${AGENCY}_${CONTAINER_NAME}.json | ||||||
| { | ||||||
| "token" : "$token" | ||||||
| } | ||||||
| EOF | ||||||
|
|
||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Verification agent
🧩 Analysis chain
Confirm DCO app supports these keys and that org repo has the app installed
The keys
allowRemediationCommits.individualand.thirdPartylook plausible but DCO config schemas vary by app. Please verify the GitHub App you use for DCO enforcement recognizes these options, otherwise the config will be ignored.To validate quickly:
You can also confirm the exact config keys with a quick web check:
🏁 Script executed:
Length of output: 528
🌐 Web query:
💡 Result:
Yes. The probot DCO app supports a .github/dco.yml schema that includes an allowRemediationCommits block with boolean flags individual and thirdParty. Example forms:
Enable individual remediation:
allowRemediationCommits:
individual: true
Enable third‑party remediation (requires individual: true):
allowRemediationCommits:
individual: true
thirdParty: true
(Other options such as require: members: false are also supported.) [1][2]
Install or enable the GitHub DCO App
The keys
allowRemediationCommits.individualandthirdPartyare valid for the probot DCO schema, but the GH CLI call (gh api repos/credebl/platform/installations) returned 404, indicating the DCO app isn’t installed or authorized on this repo. Please install or enable the DCO GitHub App to enforce these settings.🤖 Prompt for AI Agents