Remove Publish stack

spire/templates/apps-100A.yml

@@ -39,7 +39,6 @@ Parameters:
   MetaHostname: { Type: String }
   MetricsHostname: { Type: String }
   PlayHostname: { Type: String }
-  PublishHostname: { Type: String }
   TheWorldSearchHostname: { Type: String }
   TheWorldSearchInternalHostname: { Type: String }
   SharedAuroraMysqlEndpoint: { Type: String }
@@ -292,7 +291,6 @@ Resources:
         FeederHostname: !Ref FeederHostname
         IdHostname: !Ref IdHostname
         MetricsHostname: !Ref MetricsHostname
-        PublishHostname: !Ref PublishHostname
         MediajointS3BucketArn: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Exchange/${AWS::Region}/s3-bucket-arn
         PorterJobExecutionSnsTopicArn: !Ref PorterJobExecutionSnsTopicArn
         SharedAuroraMysqlEndpoint: !Ref SharedAuroraMysqlEndpoint

spire/templates/apps-200A.yml

@@ -65,7 +65,6 @@ Parameters:
   FeederAuthProxyInternalHostname: { Type: String }
   FixerHostname: { Type: String }
   IdHostname: { Type: String }
-  MetricsHostname: { Type: String }
   NetworksHostname: { Type: String }
   PlayHostname: { Type: String }
   FeederCdnHostname: { Type: String }
@@ -86,8 +85,6 @@ Parameters:
 
   NetworksSharedAlbListenerRulePriorityPrefix: { Type: String }
 
-  PublishSharedAlbListenerRulePriorityPrefix: { Type: String }
-
   RemixSharedAlbListenerRulePriorityPrefix: { Type: String }
 
   DovetailAppleApiBridgeEndpointUrl: { Type: String }
@@ -339,46 +336,6 @@ Resources:
       TemplateURL: !Sub ${TemplateUrlPrefix}/networks.yml
       TimeoutInMinutes: 30
 
-  PublishStack:
-    Type: AWS::CloudFormation::Stack
-    DeletionPolicy: Delete
-    UpdateReplacePolicy: Delete
-    Properties:
-      Parameters:
-        NestedChangeSetScrubbingResourcesState: !Ref NestedChangeSetScrubbingResourcesState
-        AlbFullName: !Ref AlbFullName
-        AlbHttpsListenerArn: !Ref AlbHttpsListenerArn
-        EcsClusterArn: !Ref EcsClusterArn
-        VpcId: !Ref VpcId
-        EcrImageTag: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Publish/pkg/docker-image-tag
-        AlbListenerRulePriorityPrefix: !Ref PublishSharedAlbListenerRulePriorityPrefix
-        NewRelicApiKeyPrxLite: !Ref NewRelicApiKeyPrxLite
-        EnvironmentType: !Ref EnvironmentType
-        EnvironmentTypeAbbreviation: !Ref EnvironmentTypeAbbreviation
-        RootStackName: !Ref RootStackName
-        RootStackId: !Ref RootStackId
-        S3SigningUserName: !Ref S3SigningUserName
-        S3SigningEndpointUrl: !Ref S3SigningEndpointUrl
-        S3SigningAccessKeyId: !Ref S3SigningAccessKeyId
-        CastleHostname: !Ref CastleHostname
-        CmsHostname: !Ref CmsHostname
-        FeederHostname: !Ref FeederHostname
-        IdHostname: !Ref IdHostname
-        MetricsHostname: !Ref MetricsHostname
-        PlayHostname: !Ref PlayHostname
-
-      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: Dovetail }
-        - { Key: prx:dev:application, Value: Publish }
-      TemplateURL: !Sub ${TemplateUrlPrefix}/publish.yml
-      TimeoutInMinutes: 20
-
   RemixStack:
     Type: AWS::CloudFormation::Stack
     DeletionPolicy: Delete
@@ -454,8 +411,5 @@ Outputs:
   NetworksPublicWebTargetGroupFullName:
     Value: !GetAtt NetworksStack.Outputs.PublicWebTargetGroupFullName
 
-  PublishTargetGroupFullName:
-    Value: !GetAtt PublishStack.Outputs.TargetGroupFullName
-
   RemixTargetGroupFullName:
     Value: !GetAtt RemixStack.Outputs.TargetGroupFullName

spire/templates/apps/feeder.yml

@@ -150,6 +150,24 @@ Resources:
             - feeder.*
       ListenerArn: !Ref AlbHttpsListenerArn
       Priority: !Join ["", [!Ref AlbListenerRulePriorityPrefix, "99"]]
+  LegacyPublishRedirectListenerRule:
+    Type: AWS::ElasticLoadBalancingV2::ListenerRule
+    Properties:
+      Actions:
+        - RedirectConfig:
+            Host: !Ref FeederHostname
+            Path: "/"
+            Port: "443"
+            Protocol: HTTPS
+            Query: ""
+            StatusCode: HTTP_301
+          Type: redirect
+      Conditions:
+        - Field: host-header
+          Values:
+            - publish.*
+      ListenerArn: !Ref AlbHttpsListenerArn
+      Priority: !Join ["", [!Ref AlbListenerRulePriorityPrefix, "88"]]
 
   DefaultJobQueue:
     Type: AWS::SQS::Queue

spire/templates/apps/id.yml

@@ -35,7 +35,6 @@ Parameters:
   FeederHostname: { Type: String }
   IdHostname: { Type: String }
   MetricsHostname: { Type: String }
-  PublishHostname: { Type: String }
   MediajointS3BucketArn: { Type: AWS::SSM::Parameter::Value<String> }
   PorterJobExecutionSnsTopicArn: { Type: String }
   SharedAuroraMysqlEndpoint: { Type: String }
@@ -318,8 +317,6 @@ Resources:
               Value: !Ref FeederHostname
             - Name: METRICS_HOST
               Value: !Ref MetricsHostname
-            - Name: PUBLISH_HOST
-              Value: !Ref PublishHostname
           Essential: true
           Image: !Sub ${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/${EcrImageTag}
           LinuxParameters: