From da3c5899e42984c2939b26e675d9ed4bf9e55cf1 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Tue, 3 Jan 2023 19:02:11 +0900 Subject: [PATCH] Deleting the copilot addons now that we're using a pure RDS postgres database --- backend/oasst_backend/config.py | 1 - copilot/api/addons/api-cluster.yml | 161 ----------------------------- copilot/web/addons/web-cluster.yml | 161 ----------------------------- 3 files changed, 323 deletions(-) delete mode 100644 copilot/api/addons/api-cluster.yml delete mode 100644 copilot/web/addons/web-cluster.yml diff --git a/backend/oasst_backend/config.py b/backend/oasst_backend/config.py index dc602c8b..602780be 100644 --- a/backend/oasst_backend/config.py +++ b/backend/oasst_backend/config.py @@ -44,5 +44,4 @@ class Settings(BaseSettings): raise ValueError(v) -print("cats") settings = Settings(_env_file=".env") diff --git a/copilot/api/addons/api-cluster.yml b/copilot/api/addons/api-cluster.yml deleted file mode 100644 index c4a17848..00000000 --- a/copilot/api/addons/api-cluster.yml +++ /dev/null @@ -1,161 +0,0 @@ -Parameters: - App: - Type: String - Description: Your application's name. - Env: - Type: String - Description: - The environment name your service, job, or workflow is being deployed to. - Name: - 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. - apiclusterDBName: - Type: String - Description: - The name of the initial database to be created in the Aurora Serverless v2 - cluster. - Default: oassist_api - # Cannot have special characters - # Naming constraints: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Limits.html#RDS_Limits.Constraints -Mappings: - apiclusterEnvScalingConfigurationMap: - staging: - "DBMinCapacity": 0.5 # AllowedValues: from 0.5 through 128 - "DBMaxCapacity": 8 # AllowedValues: from 0.5 through 128 - - All: - "DBMinCapacity": 0.5 # AllowedValues: from 0.5 through 128 - "DBMaxCapacity": 8 # AllowedValues: from 0.5 through 128 - -Resources: - apiclusterDBSubnetGroup: - Type: "AWS::RDS::DBSubnetGroup" - Properties: - DBSubnetGroupDescription: - Group of Copilot private subnets for Aurora Serverless v2 cluster. - SubnetIds: - !Split [",", { "Fn::ImportValue": !Sub "${App}-${Env}-PrivateSubnets" }] - apiclusterSecurityGroup: - Metadata: - "aws:copilot:description": - "A security group for your workload to access the Aurora Serverless v2 - cluster apicluster" - Type: "AWS::EC2::SecurityGroup" - Properties: - GroupDescription: - !Sub "The Security Group for ${Name} to access Aurora Serverless v2 - cluster apicluster." - VpcId: - Fn::ImportValue: !Sub "${App}-${Env}-VpcId" - Tags: - - Key: Name - Value: !Sub "copilot-${App}-${Env}-${Name}-Aurora" - apiclusterDBClusterSecurityGroup: - Metadata: - "aws:copilot:description": - "A security group for your Aurora Serverless v2 cluster apicluster" - Type: AWS::EC2::SecurityGroup - Properties: - GroupDescription: The Security Group for the Aurora Serverless v2 cluster. - SecurityGroupIngress: - - ToPort: 5432 - FromPort: 5432 - IpProtocol: tcp - Description: - !Sub "From the Aurora Security Group of the workload ${Name}." - SourceSecurityGroupId: !Ref apiclusterSecurityGroup - VpcId: - Fn::ImportValue: !Sub "${App}-${Env}-VpcId" - apiclusterAuroraSecret: - Metadata: - "aws:copilot:description": - "A Secrets Manager secret to store your DB credentials" - Type: AWS::SecretsManager::Secret - Properties: - Description: !Sub Aurora main user secret for ${AWS::StackName} - GenerateSecretString: - SecretStringTemplate: '{"username": "postgres"}' - GenerateStringKey: "password" - ExcludePunctuation: true - IncludeSpace: false - PasswordLength: 16 - apiclusterDBClusterParameterGroup: - Metadata: - "aws:copilot:description": - "A DB parameter group for engine configuration values" - Type: "AWS::RDS::DBClusterParameterGroup" - Properties: - Description: !Ref "AWS::StackName" - Family: "aurora-postgresql14" - Parameters: - client_encoding: "UTF8" - apiclusterDBCluster: - Metadata: - "aws:copilot:description": - "The apicluster Aurora Serverless v2 database cluster" - Type: "AWS::RDS::DBCluster" - Properties: - MasterUsername: - !Join [ - "", - [ - "{{resolve:secretsmanager:", - !Ref apiclusterAuroraSecret, - ":SecretString:username}}", - ], - ] - MasterUserPassword: - !Join [ - "", - [ - "{{resolve:secretsmanager:", - !Ref apiclusterAuroraSecret, - ":SecretString:password}}", - ], - ] - DatabaseName: !Ref apiclusterDBName - Engine: "aurora-postgresql" - EngineVersion: "14.4" - DBClusterParameterGroupName: !Ref apiclusterDBClusterParameterGroup - DBSubnetGroupName: !Ref apiclusterDBSubnetGroup - Port: 5432 - VpcSecurityGroupIds: - - !Ref apiclusterDBClusterSecurityGroup - ServerlessV2ScalingConfiguration: - # Replace "All" below with "!Ref Env" to set different autoscaling limits per environment. - MinCapacity: - !FindInMap [apiclusterEnvScalingConfigurationMap, All, DBMinCapacity] - MaxCapacity: - !FindInMap [apiclusterEnvScalingConfigurationMap, All, DBMaxCapacity] - apiclusterDBWriterInstance: - Metadata: - "aws:copilot:description": - "The apicluster Aurora Serverless v2 writer instance" - Type: "AWS::RDS::DBInstance" - Properties: - DBClusterIdentifier: !Ref apiclusterDBCluster - DBInstanceClass: db.serverless - Engine: "aurora-postgresql" - PromotionTier: 1 - AvailabilityZone: !Select - - 0 - - !GetAZs - Ref: AWS::Region - - apiclusterSecretAuroraClusterAttachment: - Type: AWS::SecretsManager::SecretTargetAttachment - Properties: - SecretId: !Ref apiclusterAuroraSecret - TargetId: !Ref apiclusterDBCluster - TargetType: AWS::RDS::DBCluster -Outputs: - apiclusterSecret: # injected as APICLUSTER_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 apiclusterAuroraSecret - apiclusterSecurityGroup: - Description: "The security group to attach to the workload." - Value: !Ref apiclusterSecurityGroup diff --git a/copilot/web/addons/web-cluster.yml b/copilot/web/addons/web-cluster.yml deleted file mode 100644 index c7a337bf..00000000 --- a/copilot/web/addons/web-cluster.yml +++ /dev/null @@ -1,161 +0,0 @@ -Parameters: - App: - Type: String - Description: Your application's name. - Env: - Type: String - Description: - The environment name your service, job, or workflow is being deployed to. - Name: - 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. - webclusterDBName: - Type: String - Description: - The name of the initial database to be created in the Aurora Serverless v2 - cluster. - Default: oassist_web - # Cannot have special characters - # Naming constraints: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Limits.html#RDS_Limits.Constraints -Mappings: - webclusterEnvScalingConfigurationMap: - staging: - "DBMinCapacity": 0.5 # AllowedValues: from 0.5 through 128 - "DBMaxCapacity": 8 # AllowedValues: from 0.5 through 128 - - All: - "DBMinCapacity": 0.5 # AllowedValues: from 0.5 through 128 - "DBMaxCapacity": 8 # AllowedValues: from 0.5 through 128 - -Resources: - webclusterDBSubnetGroup: - Type: "AWS::RDS::DBSubnetGroup" - Properties: - DBSubnetGroupDescription: - Group of Copilot private subnets for Aurora Serverless v2 cluster. - SubnetIds: - !Split [",", { "Fn::ImportValue": !Sub "${App}-${Env}-PrivateSubnets" }] - webclusterSecurityGroup: - Metadata: - "aws:copilot:description": - "A security group for your workload to access the Aurora Serverless v2 - cluster webcluster" - Type: "AWS::EC2::SecurityGroup" - Properties: - GroupDescription: - !Sub "The Security Group for ${Name} to access Aurora Serverless v2 - cluster webcluster." - VpcId: - Fn::ImportValue: !Sub "${App}-${Env}-VpcId" - Tags: - - Key: Name - Value: !Sub "copilot-${App}-${Env}-${Name}-Aurora" - webclusterDBClusterSecurityGroup: - Metadata: - "aws:copilot:description": - "A security group for your Aurora Serverless v2 cluster webcluster" - Type: AWS::EC2::SecurityGroup - Properties: - GroupDescription: The Security Group for the Aurora Serverless v2 cluster. - SecurityGroupIngress: - - ToPort: 5432 - FromPort: 5432 - IpProtocol: tcp - Description: - !Sub "From the Aurora Security Group of the workload ${Name}." - SourceSecurityGroupId: !Ref webclusterSecurityGroup - VpcId: - Fn::ImportValue: !Sub "${App}-${Env}-VpcId" - webclusterAuroraSecret: - Metadata: - "aws:copilot:description": - "A Secrets Manager secret to store your DB credentials" - Type: AWS::SecretsManager::Secret - Properties: - Description: !Sub Aurora main user secret for ${AWS::StackName} - GenerateSecretString: - SecretStringTemplate: '{"username": "postgres"}' - GenerateStringKey: "password" - ExcludePunctuation: true - IncludeSpace: false - PasswordLength: 16 - webclusterDBClusterParameterGroup: - Metadata: - "aws:copilot:description": - "A DB parameter group for engine configuration values" - Type: "AWS::RDS::DBClusterParameterGroup" - Properties: - Description: !Ref "AWS::StackName" - Family: "aurora-postgresql14" - Parameters: - client_encoding: "UTF8" - webclusterDBCluster: - Metadata: - "aws:copilot:description": - "The webcluster Aurora Serverless v2 database cluster" - Type: "AWS::RDS::DBCluster" - Properties: - MasterUsername: - !Join [ - "", - [ - "{{resolve:secretsmanager:", - !Ref webclusterAuroraSecret, - ":SecretString:username}}", - ], - ] - MasterUserPassword: - !Join [ - "", - [ - "{{resolve:secretsmanager:", - !Ref webclusterAuroraSecret, - ":SecretString:password}}", - ], - ] - DatabaseName: !Ref webclusterDBName - Engine: "aurora-postgresql" - EngineVersion: "14.4" - DBClusterParameterGroupName: !Ref webclusterDBClusterParameterGroup - DBSubnetGroupName: !Ref webclusterDBSubnetGroup - Port: 5432 - VpcSecurityGroupIds: - - !Ref webclusterDBClusterSecurityGroup - ServerlessV2ScalingConfiguration: - # Replace "All" below with "!Ref Env" to set different autoscaling limits per environment. - MinCapacity: - !FindInMap [webclusterEnvScalingConfigurationMap, All, DBMinCapacity] - MaxCapacity: - !FindInMap [webclusterEnvScalingConfigurationMap, All, DBMaxCapacity] - webclusterDBWriterInstance: - Metadata: - "aws:copilot:description": - "The webcluster Aurora Serverless v2 writer instance" - Type: "AWS::RDS::DBInstance" - Properties: - DBClusterIdentifier: !Ref webclusterDBCluster - DBInstanceClass: db.serverless - Engine: "aurora-postgresql" - PromotionTier: 1 - AvailabilityZone: !Select - - 0 - - !GetAZs - Ref: AWS::Region - - webclusterSecretAuroraClusterAttachment: - Type: AWS::SecretsManager::SecretTargetAttachment - Properties: - SecretId: !Ref webclusterAuroraSecret - TargetId: !Ref webclusterDBCluster - TargetType: AWS::RDS::DBCluster -Outputs: - webclusterSecret: # injected as WEBCLUSTER_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 webclusterAuroraSecret - webclusterSecurityGroup: - Description: "The security group to attach to the workload." - Value: !Ref webclusterSecurityGroup