Skip to content

Commit

Permalink
Remove TW search stack
Browse files Browse the repository at this point in the history
  • Loading branch information
farski committed Nov 5, 2024
1 parent 3a67a11 commit 1aa47df
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 324 deletions.
37 changes: 0 additions & 37 deletions spire/templates/apps-100A.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ Parameters:
MetaHostname: { Type: String }
MetricsHostname: { Type: String }
PlayHostname: { Type: String }
TheWorldSearchHostname: { Type: String }
TheWorldSearchInternalHostname: { Type: String }
SharedAuroraMysqlEndpoint: { Type: String }
SharedAuroraMysqlPort: { Type: String }
SharedRedisClientSecurityGroupId: { Type: AWS::EC2::SecurityGroup::Id }
Expand Down Expand Up @@ -422,36 +420,6 @@ Resources:
TemplateURL: !Sub ${TemplateUrlPrefix}/styleguide.yml
TimeoutInMinutes: 20

TheWorldSearchStack:
Type: AWS::CloudFormation::Stack
DeletionPolicy: Delete
UpdateReplacePolicy: Delete
Properties:
Parameters:
NestedChangeSetScrubbingResourcesState: !Ref NestedChangeSetScrubbingResourcesState
EnvironmentType: !Ref EnvironmentType
EnvironmentTypeAbbreviation: !Ref EnvironmentTypeAbbreviation
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CodeS3Bucket: !Ref DeploymentPackageBucketName
CodeS3ObjectKey: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/The_World-Search/pkg/s3-object-key
GoogleapisLayerS3ObjectKey: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/The_World-Search/googleapis-layer/pkg/s3-object-key
TheWorldSearchGoogleCustomSearchEngineId: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/The_World-Search/google-custom-search-engine-id
TheWorldSearchGoogleCustomSearchApiKey: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/The_World-Search/google-custom-search-api-key
TheWorldSearchHostname: !Ref TheWorldSearchHostname
TheWorldSearchInternalHostname: !Ref TheWorldSearchInternalHostname
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
- { Key: prx:cloudformation:stack-id, Value: !Ref AWS::StackId }
- { Key: prx:cloudformation:root-stack-name, Value: !Ref RootStackName }
- { Key: prx:cloudformation:root-stack-id, Value: !Ref RootStackId }
- { Key: prx:ops:environment, Value: !Ref EnvironmentType }
- { Key: prx:dev:family, Value: The World }
- { Key: prx:dev:application, Value: Search }
TemplateURL: !Sub ${TemplateUrlPrefix}/theworld-search.yml
TimeoutInMinutes: 5

TheWorldWebsiteStack:
Type: AWS::CloudFormation::Stack
UpdateReplacePolicy: Delete
Expand Down Expand Up @@ -520,8 +488,3 @@ Outputs:

PlayWebTargetGroupFullName:
Value: !GetAtt PlayStack.Outputs.WebTargetGroupFullName

TheWorldSearchApiId:
Value: !GetAtt TheWorldSearchStack.Outputs.ApiId
TheWorldSearchApiEndpoint:
Value: !GetAtt TheWorldSearchStack.Outputs.ApiEndpoint
277 changes: 0 additions & 277 deletions spire/templates/apps/theworld-search.yml

This file was deleted.

6 changes: 1 addition & 5 deletions spire/templates/dashboards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ Parameters:

TheCountApiId: { Type: String }

TheWorldSearchApiId: { Type: String }
TheWorldSearchApiEndpoint: { Type: String }

Conditions:
EnableNestedChangeSetScrubbingResources: !Equals [!Ref NestedChangeSetScrubbingResourcesState, Enabled]

Expand Down Expand Up @@ -115,7 +112,7 @@ Resources:
"width": 18,
"height": 9,
"properties": {
"markdown": "\n# Details\n\n- Environment: **${EnvironmentType}**\n- Root stack: **[${RootStackName}](https://${AWS::Region}.console.aws.amazon.com/cloudformation/home?region=${AWS::Region}#/stacks/stackinfo?stackId=${RootStackId})**\n- Infrastructure repository Git commit: **[${InfrastructureGitCommit}](https://github.com/PRX/Infrastructure/commit/${InfrastructureGitCommit})**\n- Shared VPC ID: **[${SharedVpcId}](https://console.aws.amazon.com/vpcconsole/home?region=${AWS::Region}#VpcDetails:VpcId=${SharedVpcId})**\n- Shared VPC CIDR block: **${SharedVpcCidrBlock}**\n- Shared ALB: **[${SharedAlbName}](https://${AWS::Region}.console.aws.amazon.com/ec2/home?region=${AWS::Region}#LoadBalancer:loadBalancerArn=${SharedAlbArn};tab=listeners)**\n- Dovetail ALB: **[${DovetailAlbName}](https://${AWS::Region}.console.aws.amazon.com/ec2/home?region=${AWS::Region}#LoadBalancer:loadBalancerArn=${DovetailAlbArn};tab=listeners)**\n- Exchange FTP NLB: **[${ExchangeFtpServerNlbName}](https://${AWS::Region}.console.aws.amazon.com/ec2/home?region=${AWS::Region}#LoadBalancer:loadBalancerArn=${ExchangeFtpServerNlbArn};tab=listeners)**\n- Exchange FTP public IP: **[${ExchangeFtpServerPublicIp}](https://${AWS::Region}.console.aws.amazon.com/ec2/home?region=${AWS::Region}#ElasticIpDetails:AllocationId=${ExchangeFtpServerPublicIpAllocationId})**\n---\n- Beta bucket: **${BetaDeployBucketRegionalDomainName}**\n---\n- Proxy API: **[${ProxyApiDefaultEndpoint}](${ProxyApiDefaultEndpoint})**\n- The World Search API: **[${TheWorldSearchApiEndpoint}](${TheWorldSearchApiEndpoint})**"
"markdown": "\n# Details\n\n- Environment: **${EnvironmentType}**\n- Root stack: **[${RootStackName}](https://${AWS::Region}.console.aws.amazon.com/cloudformation/home?region=${AWS::Region}#/stacks/stackinfo?stackId=${RootStackId})**\n- Infrastructure repository Git commit: **[${InfrastructureGitCommit}](https://github.com/PRX/Infrastructure/commit/${InfrastructureGitCommit})**\n- Shared VPC ID: **[${SharedVpcId}](https://console.aws.amazon.com/vpcconsole/home?region=${AWS::Region}#VpcDetails:VpcId=${SharedVpcId})**\n- Shared VPC CIDR block: **${SharedVpcCidrBlock}**\n- Shared ALB: **[${SharedAlbName}](https://${AWS::Region}.console.aws.amazon.com/ec2/home?region=${AWS::Region}#LoadBalancer:loadBalancerArn=${SharedAlbArn};tab=listeners)**\n- Dovetail ALB: **[${DovetailAlbName}](https://${AWS::Region}.console.aws.amazon.com/ec2/home?region=${AWS::Region}#LoadBalancer:loadBalancerArn=${DovetailAlbArn};tab=listeners)**\n- Exchange FTP NLB: **[${ExchangeFtpServerNlbName}](https://${AWS::Region}.console.aws.amazon.com/ec2/home?region=${AWS::Region}#LoadBalancer:loadBalancerArn=${ExchangeFtpServerNlbArn};tab=listeners)**\n- Exchange FTP public IP: **[${ExchangeFtpServerPublicIp}](https://${AWS::Region}.console.aws.amazon.com/ec2/home?region=${AWS::Region}#ElasticIpDetails:AllocationId=${ExchangeFtpServerPublicIpAllocationId})**\n---\n- Beta bucket: **${BetaDeployBucketRegionalDomainName}**\n---\n- Proxy API: **[${ProxyApiDefaultEndpoint}](${ProxyApiDefaultEndpoint})**"
}
},
{
Expand Down Expand Up @@ -182,7 +179,6 @@ Resources:
[ "AWS/ApiGateway", "Count", "ApiId", "${S3SigningApiId}", { "label": "S3 Signing" } ],
[ "AWS/ApplicationELB", "RequestCount", "TargetGroup", "${TheCastleTargetGroupFullName}", "LoadBalancer", "${SharedAlbFullName}", { "label": "The Castle" } ],
[ "AWS/ApiGateway", "Count", "ApiId", "${TheCountApiId}", { "label": "The Count" } ],
[ "AWS/ApiGateway", "Count", "ApiId", "${TheWorldSearchApiId}", { "label": "The World Search" } ],
[ "AWS/ApplicationELB", "RequestCount", "TargetGroup", "${WfmtTargetGroupFullName}", "LoadBalancer", "${SharedAlbFullName}", { "label": "WFMT" } ]
],
"view": "timeSeries",
Expand Down
5 changes: 0 additions & 5 deletions spire/templates/root.yml
Original file line number Diff line number Diff line change
Expand Up @@ -666,8 +666,6 @@ Resources:
MetaHostname: !GetAtt Constants2.Outputs.MetaHostname
MetricsHostname: !GetAtt Constants2.Outputs.MetricsHostname
PlayHostname: !GetAtt Constants2.Outputs.PlayHostname
TheWorldSearchHostname: !GetAtt Constants2.Outputs.TheWorldSearchHostname
TheWorldSearchInternalHostname: !GetAtt Constants2.Outputs.TheWorldSearchInternalHostname
SharedAuroraMysqlEndpoint: !Ref SharedAuroraMysqlEndpoint
SharedAuroraMysqlPort: !Ref SharedAuroraMysqlPort
AnnounceResourcePrefix: !GetAtt SharedAnnounceStack.Outputs.ResourcePrefix
Expand Down Expand Up @@ -1063,9 +1061,6 @@ Resources:
TheCastleTargetGroupFullName: !GetAtt Apps400AStack.Outputs.TheCastleTargetGroupFullName

TheCountApiId: !GetAtt Apps300AStack.Outputs.TheCountApiId

TheWorldSearchApiId: !GetAtt Apps100AStack.Outputs.TheWorldSearchApiId
TheWorldSearchApiEndpoint: !GetAtt Apps100AStack.Outputs.TheWorldSearchApiEndpoint
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down

0 comments on commit 1aa47df

Please sign in to comment.