Skip to content

Commit

Permalink
renamed all the resources to fsd-fab
Browse files Browse the repository at this point in the history
  • Loading branch information
Tiny49 committed Jul 26, 2024
1 parent a3f651f commit 24d27ea
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ Parameters:
Type: String
Description: The name of the service, job, or workflow being deployed.
# Customize your Aurora Serverless cluster by setting the default value of the following parameters.
fsdselfserveclusterDBName:
fsdfundapplicationbuilderclusterDBName:
Type: String
Description: The name of the initial database to be created in the Aurora Serverless v2 cluster.
Default: fsd_self_serve
# Cannot have special characters
# Naming constraints: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Limits.html#RDS_Limits.Constraints
Mappings:
fsdselfserveclusterEnvScalingConfigurationMap:
fsdfundapplicationbuilderclusterEnvScalingConfigurationMap:
All:
"DBMinCapacity": 0.5 # AllowedValues: from 0.5 through 128
"DBMaxCapacity": 8 # AllowedValues: from 0.5 through 128
Expand All @@ -31,27 +31,27 @@ Mappings:
"SecurityGroup": "sg-08cecea8f9b8a4ec9"

Resources:
fsdselfserveclusterDBSubnetGroup:
fsdfundapplicationbuilderclusterDBSubnetGroup:
Type: 'AWS::RDS::DBSubnetGroup'
Properties:
DBSubnetGroupDescription: Group of Copilot private subnets for Aurora Serverless v2 cluster.
SubnetIds:
!Split [',', { 'Fn::ImportValue': !Sub '${App}-${Env}-PrivateSubnets' }]
fsdselfserveclusterSecurityGroup:
fsdfundapplicationbuilderclusterSecurityGroup:
Metadata:
'aws:copilot:description': 'A security group for your workload to access the Aurora Serverless v2 cluster fsdselfservecluster'
'aws:copilot:description': 'A security group for your workload to access the Aurora Serverless v2 cluster fsdfundapplicationbuildercluster'
Type: 'AWS::EC2::SecurityGroup'
Properties:
GroupDescription: !Sub 'The Security Group for ${Name} to access Aurora Serverless v2 cluster fsdselfservecluster.'
GroupDescription: !Sub 'The Security Group for ${Name} to access Aurora Serverless v2 cluster fsdfundapplicationbuildercluster.'
VpcId:
Fn::ImportValue:
!Sub '${App}-${Env}-VpcId'
Tags:
- Key: Name
Value: !Sub 'copilot-${App}-${Env}-${Name}-Aurora'
fsdselfserveclusterDBClusterSecurityGroup:
fsdfundapplicationbuilderclusterDBClusterSecurityGroup:
Metadata:
'aws:copilot:description': 'A security group for your Aurora Serverless v2 cluster fsdselfservecluster'
'aws:copilot:description': 'A security group for your Aurora Serverless v2 cluster fsdfundapplicationbuildercluster'
Type: AWS::EC2::SecurityGroup
Properties:
GroupDescription: The Security Group for the Aurora Serverless v2 cluster.
Expand All @@ -60,7 +60,7 @@ Resources:
FromPort: 5432
IpProtocol: tcp
Description: !Sub 'From the Aurora Security Group of the workload ${Name}.'
SourceSecurityGroupId: !Ref fsdselfserveclusterSecurityGroup
SourceSecurityGroupId: !Ref fsdfundapplicationbuilderclusterSecurityGroup
- ToPort: 5432
FromPort: 5432
IpProtocol: tcp
Expand All @@ -72,7 +72,7 @@ Resources:
Tags:
- Key: Name
Value: !Sub 'copilot-${App}-${Env}-${Name}-Aurora'
fsdselfserveclusterAuroraSecret:
fsdfundapplicationbuilderclusterAuroraSecret:
Metadata:
'aws:copilot:description': 'A Secrets Manager secret to store your DB credentials'
Type: AWS::SecretsManager::Secret
Expand All @@ -84,7 +84,7 @@ Resources:
ExcludePunctuation: true
IncludeSpace: false
PasswordLength: 16
fsdselfserveclusterDBClusterParameterGroup:
fsdfundapplicationbuilderclusterDBClusterParameterGroup:
Metadata:
'aws:copilot:description': 'A DB parameter group for engine configuration values'
Type: 'AWS::RDS::DBClusterParameterGroup'
Expand All @@ -93,35 +93,35 @@ Resources:
Family: 'aurora-postgresql14'
Parameters:
client_encoding: 'UTF8'
fsdselfserveclusterDBCluster:
fsdfundapplicationbuilderclusterDBCluster:
Metadata:
'aws:copilot:description': 'The fsdselfservecluster Aurora Serverless v2 database cluster'
'aws:copilot:description': 'The fsdfundapplicationbuildercluster Aurora Serverless v2 database cluster'
Type: 'AWS::RDS::DBCluster'
Properties:
MasterUsername:
!Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdselfserveclusterAuroraSecret, ":SecretString:username}}" ]] # pragma: allowlist secret
!Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdfundapplicationbuilderclusterAuroraSecret, ":SecretString:username}}" ]] # pragma: allowlist secret
MasterUserPassword:
!Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdselfserveclusterAuroraSecret, ":SecretString:password}}" ]] # pragma: allowlist secret
DatabaseName: !Ref fsdselfserveclusterDBName
!Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdfundapplicationbuilderclusterAuroraSecret, ":SecretString:password}}" ]] # pragma: allowlist secret
DatabaseName: !Ref fsdfundapplicationbuilderclusterDBName
Engine: 'aurora-postgresql'
EngineVersion: '14.4'
DBClusterParameterGroupName: !Ref fsdselfserveclusterDBClusterParameterGroup
DBSubnetGroupName: !Ref fsdselfserveclusterDBSubnetGroup
DBClusterParameterGroupName: !Ref fsdfundapplicationbuilderclusterDBClusterParameterGroup
DBSubnetGroupName: !Ref fsdfundapplicationbuilderclusterDBSubnetGroup
Port: 5432
StorageEncrypted: true
BackupRetentionPeriod: 8
VpcSecurityGroupIds:
- !Ref fsdselfserveclusterDBClusterSecurityGroup
- !Ref fsdfundapplicationbuilderclusterDBClusterSecurityGroup
ServerlessV2ScalingConfiguration:
# Replace "All" below with "!Ref Env" to set different autoscaling limits per environment.
MinCapacity: !FindInMap [fsdselfserveclusterEnvScalingConfigurationMap, All, DBMinCapacity]
MaxCapacity: !FindInMap [fsdselfserveclusterEnvScalingConfigurationMap, All, DBMaxCapacity]
fsdselfserveclusterDBWriterInstance:
MinCapacity: !FindInMap [fsdfundapplicationbuilderclusterEnvScalingConfigurationMap, All, DBMinCapacity]
MaxCapacity: !FindInMap [fsdfundapplicationbuilderclusterEnvScalingConfigurationMap, All, DBMaxCapacity]
fsdfundapplicationbuilderclusterDBWriterInstance:
Metadata:
'aws:copilot:description': 'The fsdselfservecluster Aurora Serverless v2 writer instance'
'aws:copilot:description': 'The fsdfundapplicationbuildercluster Aurora Serverless v2 writer instance'
Type: 'AWS::RDS::DBInstance'
Properties:
DBClusterIdentifier: !Ref fsdselfserveclusterDBCluster
DBClusterIdentifier: !Ref fsdfundapplicationbuilderclusterDBCluster
DBInstanceClass: db.serverless
Engine: 'aurora-postgresql'
PromotionTier: 1
Expand All @@ -130,11 +130,11 @@ Resources:
- !GetAZs
Ref: AWS::Region

fsdselfserveclusterSecretAuroraClusterAttachment:
fsdfundapplicationbuilderclusterSecretAuroraClusterAttachment:
Type: AWS::SecretsManager::SecretTargetAttachment
Properties:
SecretId: !Ref fsdselfserveclusterAuroraSecret
TargetId: !Ref fsdselfserveclusterDBCluster
SecretId: !Ref fsdfundapplicationbuilderclusterAuroraSecret
TargetId: !Ref fsdfundapplicationbuilderclusterDBCluster
TargetType: AWS::RDS::DBCluster

FormRunnerFormUploadsBucketAccessPolicy:
Expand Down Expand Up @@ -166,18 +166,18 @@ Outputs:
Value:
!Sub
- "postgres://${USERNAME}:${PASSWORD}@${HOSTNAME}:${PORT}/${DBNAME}"
- USERNAME: !Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdselfserveclusterAuroraSecret, ":SecretString:username}}" ]] # pragma: allowlist secret
PASSWORD: !Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdselfserveclusterAuroraSecret, ":SecretString:password}}" ]] # pragma: allowlist secret
HOSTNAME: !Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdselfserveclusterAuroraSecret, ":SecretString:host}}" ]] # pragma: allowlist secret
PORT: !Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdselfserveclusterAuroraSecret, ":SecretString:port}}" ]] # pragma: allowlist secret
DBNAME: !Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdselfserveclusterAuroraSecret, ":SecretString:dbname}}" ]] # pragma: allowlist secret
- USERNAME: !Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdfundapplicationbuilderclusterAuroraSecret, ":SecretString:username}}" ]] # pragma: allowlist secret
PASSWORD: !Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdfundapplicationbuilderclusterAuroraSecret, ":SecretString:password}}" ]] # pragma: allowlist secret
HOSTNAME: !Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdfundapplicationbuilderclusterAuroraSecret, ":SecretString:host}}" ]] # pragma: allowlist secret
PORT: !Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdfundapplicationbuilderclusterAuroraSecret, ":SecretString:port}}" ]] # pragma: allowlist secret
DBNAME: !Join [ "", [ '{{resolve:secretsmanager:', !Ref fsdfundapplicationbuilderclusterAuroraSecret, ":SecretString:dbname}}" ]] # pragma: allowlist secret

fsdselfserveclusterSecret: # injected as FSDselfserveCLUSTER_SECRET environment variable by Copilot.
fsdfundapplicationbuilderclusterSecret: # injected as FSDfundapplicationbuilderCLUSTER_SECRET environment variable by Copilot.
Description: "The JSON secret that holds the database username and password. Fields are 'host', 'port', 'dbname', 'username', 'password', 'dbClusterIdentifier' and 'engine'"
Value: !Ref fsdselfserveclusterAuroraSecret
fsdselfserveclusterSecurityGroup:
Value: !Ref fsdfundapplicationbuilderclusterAuroraSecret
fsdfundapplicationbuilderclusterSecurityGroup:
Description: "The security group to attach to the workload."
Value: !Ref fsdselfserveclusterSecurityGroup
Value: !Ref fsdfundapplicationbuilderclusterSecurityGroup
FormRunnerFormUploadsBucketAccessPolicyArn:
Description: "The ARN of the ManagedPolicy to attach to the task role."
Value: !Ref FormRunnerFormUploadsBucketAccessPolicy
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# https://aws.github.io/copilot-cli/docs/manifest/lb-web-service/

# Your service name will be used in naming your resources like log groups, ECS services, etc.
name: fsd-self-serve
name: fsd-fund-application-builder
type: Load Balanced Web Service

# Distribute traffic to your service.
Expand All @@ -13,12 +13,12 @@ http:
path: '/'
# You can specify a custom health check path. The default is "/".
healthcheck: '/healthcheck'
#alias: self-serve.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk
#alias: fund-application-builder.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk

# Configuration for your containers and service.
image:
# Docker build arguments. For additional overrides: https://aws.github.io/copilot-cli/docs/manifest/lb-web-service/#image-location
location: ghcr.io/communitiesuk/funding-service-design-self-serve:sha-6cdb8baa686e0357be6b56730938bab7e433fd96
location: ghcr.io/communitiesuk/funding-service-design-fund-application-builder:sha-6cdb8baa686e0357be6b56730938bab7e433fd96
# Port exposed through your container to route traffic to it.
port: 8080

Expand Down Expand Up @@ -46,7 +46,7 @@ network:
# Pass environment variables as key value pairs.
# variables:
# ACCOUNT_STORE_API_HOST: "http://fsd-account-store:8080"
# APPLICANT_self-serve_HOST: "https://self-serve.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"
# APPLICANT_fund-application-builder_HOST: "https://fund-application-builder.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"
# APPLICATION_STORE_API_HOST: "http://fsd-application-store:8080"
# AUTHENTICATOR_HOST: "https://authenticator.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"
# COOKIE_DOMAIN: ".test.levellingup.gov.uk"
Expand Down Expand Up @@ -74,7 +74,7 @@ environments:
spot: 2
# uat:
# http:
# alias: "self-serve.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"
# alias: "fund-application-builder.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"
# count:
# range: 2-4
# cooldown:
Expand All @@ -88,13 +88,13 @@ environments:
# response_time: 2s
# prod:
# http:
# alias: ["self-serve.prod.access-funding.levellingup.gov.uk", "self-serve.access-funding.levellingup.gov.uk"]
# alias: ["fund-application-builder.prod.access-funding.levellingup.gov.uk", "fund-application-builder.access-funding.levellingup.gov.uk"]
# hosted_zone: Z0686469NF3ZJTU9I02M
# variables:
# COOKIE_DOMAIN: ".levellingup.gov.uk"
# AUTHENTICATOR_HOST: "https://authenticator.access-funding.levellingup.gov.uk"
# APPLICANT_self-serve_HOST: "https://self-serve.access-funding.levellingup.gov.uk"
# ASSESSMENT_self-serve_HOST: "https://assessment.access-funding.levellingup.gov.uk"
# APPLICANT_fund-application-builder_HOST: "https://fund-application-builder.access-funding.levellingup.gov.uk"
# ASSESSMENT_fund-application-builder_HOST: "https://assessment.access-funding.levellingup.gov.uk"
# FORMS_SERVICE_PUBLIC_HOST: "https://forms.access-funding.levellingup.gov.uk"
# FLASK_ENV: production
# count:
Expand Down

0 comments on commit 24d27ea

Please sign in to comment.