Added production albs

alliance-genome · Feb 28, 2024 · db565c3 · db565c3
1 parent 6b1142c
commit db565c3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/cdk/amplify-production-stack.ts b/cdk/amplify-production-stack.ts
@@ -19,8 +19,6 @@ export class AmplifyProductionStack extends cdk.Stack {
 
       { source: 'https://jira.alliancegenome.org',     target: 'https://agr-jira.atlassian.net',                                                      status: amplify.RedirectStatus.PERMANENT_REDIRECT },
       { source: 'https://alliancegenome.org',          target: 'https://www.alliancegenome.org',                                                      status: amplify.RedirectStatus.PERMANENT_REDIRECT },
-      { source: '/bluegenes',                          target: 'https://www.alliancegenome.org/bluegenes/alliancemine',                               status: amplify.RedirectStatus.PERMANENT_REDIRECT },
-      { source: '/swagger-ui',                         target: 'https://www.alliancegenome.org/swagger-ui/',                                          status: amplify.RedirectStatus.PERMANENT_REDIRECT },
 
       { source: '/api/<*>',                            target: 'https://prod-alb.alliancegenome.org/api/<*>',                                         status: amplify.RedirectStatus.REWRITE },
 
@@ -37,14 +35,19 @@ export class AmplifyProductionStack extends cdk.Stack {
       { source: '/jbrowse/worms/jbrowse2/',            target: 'https://main.d2jjb0xowet5mr.amplifyapp.com/',                                         status: amplify.RedirectStatus.REWRITE },
       { source: '/jbrowse/worms/jbrowse2/<*>',         target: 'https://main.d2jjb0xowet5mr.amplifyapp.com/<*>',                                      status: amplify.RedirectStatus.REWRITE },
 
+      { source: '/agr_simplemine.cgi',                 target: 'https://caltech-curation.textpressolab.com/pub/cgi-bin/forms/agr_simplemine.cgi',     status: amplify.RedirectStatus.REWRITE },
+
       { source: '/jbrowse/<*>',                        target: 'https://prod-alb.alliancegenome.org/jbrowse/<*>',                                     status: amplify.RedirectStatus.REWRITE },
       { source: '/apollo/<*>',                         target: 'https://prod-alb.alliancegenome.org/apollo/<*>',                                      status: amplify.RedirectStatus.REWRITE },
-      { source: '/agr_simplemine.cgi',                 target: 'https://caltech-curation.textpressolab.com/pub/cgi-bin/forms/agr_simplemine.cgi',     status: amplify.RedirectStatus.REWRITE },
-      { source: '/alliancemine/cdn/<*>',               target: 'https://prod-alb.alliancegenome.org/alliancemine/cdn/<*>',                            status: amplify.RedirectStatus.REWRITE },
-      { source: '/alliancemine/',                      target: 'https://prod-alb.alliancegenome.org/alliancemine/',                                   status: amplify.RedirectStatus.REWRITE },
-      { source: '/alliancemine/<*>',                   target: 'https://prod-alb.alliancegenome.org/alliancemine/<*>',                                status: amplify.RedirectStatus.REWRITE },
-      { source: '/bluegenes/',                         target: 'https://prod-alb.alliancegenome.org/bluegenes/alliancemine',                          status: amplify.RedirectStatus.REWRITE },
-      { source: '/bluegenes/<*>',                      target: 'https://prod-alb.alliancegenome.org/bluegenes/<*>',                                   status: amplify.RedirectStatus.REWRITE },
+
+      { source: '/alliancemine',                       target: 'https://production-alliancemine.alliancegenome.org/alliancemine/',                    status: amplify.RedirectStatus.REWRITE },
+      { source: '/alliancemine/',                      target: 'https://production-alliancemine.alliancegenome.org/alliancemine/',                    status: amplify.RedirectStatus.REWRITE },
+      { source: '/alliancemine/<*>',                   target: 'https://production-alliancemine.alliancegenome.org/alliancemine/<*>',                 status: amplify.RedirectStatus.REWRITE },
+      { source: '/bluegenes',                          target: 'https://production-alliancemine.alliancegenome.org/bluegenes/alliancemine',           status: amplify.RedirectStatus.REWRITE },
+      { source: '/bluegenes/',                         target: 'https://production-alliancemine.alliancegenome.org/bluegenes/alliancemine',           status: amplify.RedirectStatus.REWRITE },
+      { source: '/bluegenes/<*>',                      target: 'https://production-alliancemine.alliancegenome.org/bluegenes/<*>',                    status: amplify.RedirectStatus.REWRITE },
+
+      { source: '/swagger-ui',                         target: 'https://prod-alb.alliancegenome.org/swagger-ui/',                                     status: amplify.RedirectStatus.REWRITE },
       { source: '/swagger-ui/',                        target: 'https://prod-alb.alliancegenome.org/swagger-ui/',                                     status: amplify.RedirectStatus.REWRITE },
       { source: '/swagger-ui/<*>',                     target: 'https://prod-alb.alliancegenome.org/swagger-ui/<*>',                                  status: amplify.RedirectStatus.REWRITE },
       { source: '/openapi',                            target: 'https://prod-alb.alliancegenome.org/openapi',                                         status: amplify.RedirectStatus.REWRITE },

diff --git a/cdk/amplify-test-stack.ts b/cdk/amplify-test-stack.ts
@@ -16,7 +16,6 @@ export class AmplifyTestStack extends cdk.Stack {
 */
 
     const test_paths = [
-      { source: '/<*>',                                target: '/index.html',                                                                         status: amplify.RedirectStatus.NOT_FOUND_REWRITE },
       { source: '/api/<*>',                            target: 'https://test-alb.alliancegenome.org/api/<*>',                                         status: amplify.RedirectStatus.REWRITE },
 
       { source: '/jbrowse/worms/protein',              target: 'https://test.alliancegenome.org/jbrowse/worms/protein/',                              status: amplify.RedirectStatus.PERMANENT_REDIRECT },
@@ -34,19 +33,22 @@ export class AmplifyTestStack extends cdk.Stack {
 
       { source: '/agr_simplemine.cgi',                 target: 'https://caltech-curation.textpressolab.com/pub/cgi-bin/forms/agr_simplemine.cgi',     status: amplify.RedirectStatus.REWRITE },
 
+      { source: '/jbrowse/<*>',                        target: 'https://test-alb.alliancegenome.org/jbrowse/<*>',                                     status: amplify.RedirectStatus.REWRITE },
+      { source: '/apollo/<*>',                         target: 'https://test-alb.alliancegenome.org/apollo/<*>',                                      status: amplify.RedirectStatus.REWRITE },
+
       { source: '/alliancemine',                       target: 'https://production-alliancemine.alliancegenome.org/alliancemine/',                    status: amplify.RedirectStatus.REWRITE },
       { source: '/alliancemine/',                      target: 'https://production-alliancemine.alliancegenome.org/alliancemine/',                    status: amplify.RedirectStatus.REWRITE },
       { source: '/alliancemine/<*>',                   target: 'https://production-alliancemine.alliancegenome.org/alliancemine/<*>',                 status: amplify.RedirectStatus.REWRITE },
       { source: '/bluegenes',                          target: 'https://production-alliancemine.alliancegenome.org:444/bluegenes/alliancemine',       status: amplify.RedirectStatus.REWRITE },
       { source: '/bluegenes/',                         target: 'https://production-alliancemine.alliancegenome.org:444/bluegenes/alliancemine',       status: amplify.RedirectStatus.REWRITE },
       { source: '/bluegenes/<*>',                      target: 'https://production-alliancemine.alliancegenome.org:444/bluegenes/<*>',                status: amplify.RedirectStatus.REWRITE },
 
-      { source: '/jbrowse/<*>',                        target: 'https://test-alb.alliancegenome.org/jbrowse/<*>',                                     status: amplify.RedirectStatus.REWRITE },
-      { source: '/apollo/<*>',                         target: 'https://test-alb.alliancegenome.org/apollo/<*>',                                      status: amplify.RedirectStatus.REWRITE },
       { source: '/swagger-ui',                         target: 'https://test-alb.alliancegenome.org/swagger-ui',                                      status: amplify.RedirectStatus.REWRITE },
       { source: '/swagger-ui/',                        target: 'https://test-alb.alliancegenome.org/swagger-ui/',                                     status: amplify.RedirectStatus.REWRITE },
       { source: '/swagger-ui/<*>',                     target: 'https://test-alb.alliancegenome.org/swagger-ui/<*>',                                  status: amplify.RedirectStatus.REWRITE },
       { source: '/openapi',                            target: 'https://test-alb.alliancegenome.org/openapi',                                         status: amplify.RedirectStatus.REWRITE },
+
+      { source: '/<*>',                                target: '/index.html',                                                                         status: amplify.RedirectStatus.NOT_FOUND_REWRITE },
       { source: '</^[^.]+$/>',                         target: '/index.html',                                                                         status: amplify.RedirectStatus.REWRITE }
     ];
 

diff --git a/cdk/cdk-app.ts b/cdk/cdk-app.ts
@@ -30,7 +30,7 @@ new AmplifyALBStack(app, 'test-alb-stack', {
 new AmplifyALBStack(app, 'prod-alb-stack', {
   stackName: 'prod-alb-stack',
   dnsName: 'prod',
-  targetInstanceId: 'i-0b3c6166858f87457',
+  targetInstanceId: 'i-003fafec7d050fd97',
   env: {
     region: process.env.CDK_DEFAULT_REGION,
     account: process.env.CDK_DEFAULT_ACCOUNT,