Skip to content
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

Jump to bottom

LIME-1273 - Adding new call to personInfo endpoint #306

Merged
merged 1 commit into from
Oct 31, 2024
Merged

LIME-1273 - Adding new call to personInfo endpoint #306

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
10 changes: 5 additions & 5 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,30 +288,30 @@
"filename": "deploy/template.yaml",
"hashed_secret": "690de9fd42add772818ae392cb68a4f81d1511e3",
"is_verified": false,
"line_number": 105
"line_number": 109
},
{
"type": "Secret Keyword",
"filename": "deploy/template.yaml",
"hashed_secret": "b63bf00edb07af6ffba7f7ceb7ed573a913271f7",
"is_verified": false,
"line_number": 587
"line_number": 629
},
{
"type": "Secret Keyword",
"filename": "deploy/template.yaml",
"hashed_secret": "42af5cf9fcf4f09147c032a0fb4877f5cf626bbc",
"is_verified": false,
"line_number": 588
"line_number": 630
},
{
"type": "Secret Keyword",
"filename": "deploy/template.yaml",
"hashed_secret": "7584a31168b8e8f62d9b84b7b95d239b99fad815",
"is_verified": false,
"line_number": 590
"line_number": 632
}
]
},
"generated_at": "2024-10-25T12:58:37Z"
"generated_at": "2024-10-31T12:03:06Z"
}
88 changes: 63 additions & 25 deletions deploy/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Mappings:
ga4Disabled: "false"
uaDisabled: "false"
languageToggleDisabled: "false"
authSourceEnabled: "true"
build:
logLevel: "info"
dynatraceSecretArn: arn:aws:secretsmanager:eu-west-2:216552277552:secret:DynatraceNonProductionVariables
Expand All @@ -83,6 +84,7 @@ Mappings:
ga4Disabled: "false"
uaDisabled: "false"
languageToggleDisabled: "false"
authSourceEnabled: "true"
staging:
logLevel: "warn"
dynatraceSecretArn: arn:aws:secretsmanager:eu-west-2:216552277552:secret:DynatraceNonProductionVariables
Expand All @@ -92,6 +94,7 @@ Mappings:
ga4Disabled: "false"
uaDisabled: "false"
languageToggleDisabled: "false"
authSourceEnabled: "false"
integration:
logLevel: "warn"
dynatraceSecretArn: arn:aws:secretsmanager:eu-west-2:216552277552:secret:DynatraceNonProductionVariables
Expand All @@ -100,6 +103,7 @@ Mappings:
ga4Disabled: "false"
uaDisabled: "false"
languageToggleDisabled: "false"
authSourceEnabled: "false"
production:
logLevel: "warn"
dynatraceSecretArn: arn:aws:secretsmanager:eu-west-2:216552277552:secret:DynatraceProductionVariables
Expand All @@ -108,6 +112,7 @@ Mappings:
ga4Disabled: "false"
uaDisabled: "false"
languageToggleDisabled: "false"
authSourceEnabled: "false"

# see https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-access-logs.html
ElasticLoadBalancerAccountIds:
Expand Down Expand Up @@ -203,7 +208,7 @@ Resources:
!FindInMap [
ElasticLoadBalancerAccountIds,
!Ref AWS::Region,
AccountId,
AccountId
]
Action:
- s3:PutObject
Expand Down Expand Up @@ -482,28 +487,55 @@ Resources:
- Name: GOOGLE_ANALYTICS_4_GTM_CONTAINER_ID
Value: !If [IsProduction, "GTM-K4PBJH3", "GTM-KD86CMZ"]
- Name: GA4_DISABLED
Value: !FindInMap [ EnvironmentConfiguration, !Ref "Environment", ga4Disabled ]
Value:
!FindInMap [
EnvironmentConfiguration,
!Ref "Environment",
ga4Disabled
]
- Name: UA_DISABLED
Value: !FindInMap [ EnvironmentConfiguration, !Ref "Environment", uaDisabled ]
Value:
!FindInMap [
EnvironmentConfiguration,
!Ref "Environment",
uaDisabled
]
- Name: LANGUAGE_TOGGLE_DISABLED
Value: !FindInMap [ EnvironmentConfiguration, !Ref "Environment", languageToggleDisabled ]
Value:
!FindInMap [
EnvironmentConfiguration,
!Ref "Environment",
languageToggleDisabled
]
- Name: ANALYTICS_DOMAIN
Value:
!If [
IsProduction,
"account.gov.uk",
!Sub "${Environment}.account.gov.uk",
!Sub "${Environment}.account.gov.uk"
]
- Name: LOG_LEVEL
Value: !FindInMap [ EnvironmentConfiguration, !Ref "Environment", logLevel ]
Value:
!FindInMap [
EnvironmentConfiguration,
!Ref "Environment",
logLevel
]
- Name: AUTH_SOURCE_ENABLED
Value:
!FindInMap [
EnvironmentConfiguration,
!Ref "Environment",
authSourceEnabled
]
Secrets:
- Name: DT_TENANT
ValueFrom: !Join
- ""
- - !FindInMap [
EnvironmentConfiguration,
!Ref Environment,
dynatraceSecretArn,
dynatraceSecretArn
]
- ":DT_TENANT::"
- Name: DT_TENANTTOKEN
Expand All @@ -512,7 +544,7 @@ Resources:
- - !FindInMap [
EnvironmentConfiguration,
!Ref Environment,
dynatraceSecretArn,
dynatraceSecretArn
]
- ":DT_TENANTTOKEN::"
- Name: DT_CONNECTION_POINT
Expand All @@ -521,7 +553,7 @@ Resources:
- - !FindInMap [
EnvironmentConfiguration,
!Ref Environment,
dynatraceSecretArn,
dynatraceSecretArn
]
- ":DT_CONNECTION_POINT::"
PortMappings:
Expand All @@ -533,9 +565,19 @@ Resources:
awslogs-group: !Ref ECSAccessLogsGroup
awslogs-region: !Sub ${AWS::Region}
awslogs-stream-prefix: !Sub driving-permit-front-${Environment}
Cpu: !FindInMap [ EnvironmentConfiguration, !Ref "Environment", fargateCPUsize ]
Cpu:
!FindInMap [
EnvironmentConfiguration,
!Ref "Environment",
fargateCPUsize
]
ExecutionRoleArn: !GetAtt ECSTaskExecutionRole.Arn
Memory: !FindInMap [ EnvironmentConfiguration, !Ref "Environment", fargateRAMsize ]
Memory:
!FindInMap [
EnvironmentConfiguration,
!Ref "Environment",
fargateRAMsize
]
NetworkMode: awsvpc
RequiresCompatibilities:
- FARGATE
Expand Down Expand Up @@ -845,8 +887,7 @@ Resources:
# with <5% utilisation
- MetricIntervalLowerBound: -15 # 5%
MetricIntervalUpperBound: 0 # 20%
ScalingAdjustment:
-50 # Scale down 50% of containers if the metric is breached
ScalingAdjustment: -50 # Scale down 50% of containers if the metric is breached
# with <20% utilisation

EcsStepScaleOutAlarm:
Expand Down Expand Up @@ -1012,7 +1053,6 @@ Resources:
Period: 60
Stat: Sum


####################################################################
# #
# Alarm setup #
Expand Down Expand Up @@ -1065,8 +1105,7 @@ Resources:
LogGroupName: !Ref ECSAccessLogsGroup
FilterPattern: '{ $.level = "FATAL" || $.message = "Unhandled Exception:*" }'
MetricTransformations:
-
MetricValue: "1"
- MetricValue: "1"
MetricNamespace: !Sub "${AWS::StackName}/LogMessages"
MetricName: "ECSFatalerror-message"

Expand All @@ -1082,11 +1121,11 @@ Resources:
- !ImportValue platform-alarm-warning-alert-topic
AlarmActions:
- !ImportValue platform-alarm-warning-alert-topic
InsufficientDataActions: [ ]
InsufficientDataActions: []
MetricName: ECSFatalerror-message
Namespace: !Sub "${AWS::StackName}/LogMessages"
Statistic: Sum
Dimensions: [ ]
Dimensions: []
Period: 60
EvaluationPeriods: 1
DatapointsToAlarm: 1
Expand All @@ -1100,8 +1139,7 @@ Resources:
LogGroupName: !Ref APIGWAccessLogsGroup
FilterPattern: '{ $.level = "FATAL" || $.message = "Unhandled Exception:*" }'
MetricTransformations:
-
MetricValue: "1"
- MetricValue: "1"
MetricNamespace: !Sub "${AWS::StackName}/LogMessages"
MetricName: "APIGWFatalerror-message"

Expand All @@ -1117,11 +1155,11 @@ Resources:
- !ImportValue platform-alarm-warning-alert-topic
AlarmActions:
- !ImportValue platform-alarm-warning-alert-topic
InsufficientDataActions: [ ]
InsufficientDataActions: []
MetricName: APIGWFatalerror-message
Namespace: !Sub "${AWS::StackName}/LogMessages"
Statistic: Sum
Dimensions: [ ]
Dimensions: []
Period: 60
EvaluationPeriods: 1
DatapointsToAlarm: 1
Expand Down Expand Up @@ -1189,7 +1227,7 @@ Resources:
- !ImportValue platform-alarm-warning-alert-topic
AlarmActions:
- !ImportValue platform-alarm-warning-alert-topic
InsufficientDataActions: [ ]
InsufficientDataActions: []
EvaluationPeriods: 5
DatapointsToAlarm: 2
Threshold: 5
Expand Down Expand Up @@ -1238,7 +1276,7 @@ Resources:
- !ImportValue platform-alarm-warning-alert-topic
AlarmActions:
- !ImportValue platform-alarm-warning-alert-topic
InsufficientDataActions: [ ]
InsufficientDataActions: []
EvaluationPeriods: 5
DatapointsToAlarm: 2
Threshold: 1000
Expand Down Expand Up @@ -1283,7 +1321,7 @@ Resources:
- !ImportValue platform-alarm-warning-alert-topic
AlarmActions:
- !ImportValue platform-alarm-warning-alert-topic
InsufficientDataActions: [ ]
InsufficientDataActions: []
EvaluationPeriods: 5
DatapointsToAlarm: 2
Threshold: 2500
Expand Down
Loading