Skip to content

Commit f729b90

Browse files
committed
enable the core.acm.illinois.edu domain
1 parent 1a83fa3 commit f729b90

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

cloudformation/main.yml

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ Mappings:
4949
ApiCertificateArn: arn:aws:acm:us-east-1:427040638965:certificate/63ccdf0b-d2b5-44f0-b589-eceffb935c23
5050
HostedZoneId: Z04502822NVIA85WM2SML
5151
ApiDomainName: "aws.qa.acmuiuc.org"
52-
LinkryApiDomainName: "aws.qa.acmuiuc.org"
53-
LinkryApiCertificateArn: arn:aws:acm:us-east-1:427040638965:certificate/63ccdf0b-d2b5-44f0-b589-eceffb935c23
52+
EnvDomainName: "aws.qa.acmuiuc.org"
53+
EnvCertificateArn: arn:aws:acm:us-east-1:427040638965:certificate/63ccdf0b-d2b5-44f0-b589-eceffb935c23
5454
prod:
5555
ApiCertificateArn: arn:aws:acm:us-east-1:298118738376:certificate/6142a0e2-d62f-478e-bf15-5bdb616fe705
5656
HostedZoneId: Z05246633460N5MEB9DBF
5757
ApiDomainName: "aws.acmuiuc.org"
58-
LinkryApiDomainName: "acm.illinois.edu"
59-
LinkryApiCertificateArn: arn:aws:acm:us-east-1:298118738376:certificate/aeb93d9e-b0b7-4272-9c12-24ca5058c77e
58+
EnvDomainName: "acm.illinois.edu"
59+
EnvCertificateArn: arn:aws:acm:us-east-1:298118738376:certificate/aeb93d9e-b0b7-4272-9c12-24ca5058c77e
6060
EnvironmentToCidr:
6161
dev:
6262
SecurityGroupIds:
@@ -110,11 +110,11 @@ Resources:
110110
GWBaseDomainName: !FindInMap
111111
- ApiGwConfig
112112
- !Ref RunEnvironment
113-
- LinkryApiDomainName
113+
- EnvDomainName
114114
GWCertArn: !FindInMap
115115
- ApiGwConfig
116116
- !Ref RunEnvironment
117-
- LinkryApiCertificateArn
117+
- EnvCertificateArn
118118
GWApiId: !Ref AppApiGateway
119119
GWHostedZoneId: !FindInMap [ApiGwConfig, !Ref RunEnvironment, HostedZoneId]
120120

@@ -128,11 +128,31 @@ Resources:
128128
GWBaseDomainName: !FindInMap
129129
- ApiGwConfig
130130
- !Ref RunEnvironment
131-
- LinkryApiDomainName
131+
- EnvDomainName
132132
GWCertArn: !FindInMap
133133
- ApiGwConfig
134134
- !Ref RunEnvironment
135-
- LinkryApiCertificateArn
135+
- EnvCertificateArn
136+
GWApiId: !Ref AppApiGateway
137+
GWHostedZoneId: !FindInMap [ApiGwConfig, !Ref RunEnvironment, HostedZoneId]
138+
139+
140+
CoreUrlProd:
141+
Type: AWS::Serverless::Application
142+
Condition: IsProd
143+
Properties:
144+
Location: ./custom-domain.yml
145+
Parameters:
146+
RunEnvironment: !Ref RunEnvironment
147+
RecordName: core
148+
GWBaseDomainName: !FindInMap
149+
- ApiGwConfig
150+
- !Ref RunEnvironment
151+
- EnvDomainName
152+
GWCertArn: !FindInMap
153+
- ApiGwConfig
154+
- !Ref RunEnvironment
155+
- EnvCertificateArn
136156
GWApiId: !Ref AppApiGateway
137157
GWHostedZoneId: !FindInMap [ApiGwConfig, !Ref RunEnvironment, HostedZoneId]
138158

src/ui/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ const environmentConfig: EnvironmentConfigType = {
9494
ServiceConfiguration: {
9595
core: {
9696
friendlyName: 'Core Management Service',
97-
baseEndpoint: 'https://infra-core-api.aws.acmuiuc.org',
97+
baseEndpoint: 'https://core.acm.illinois.edu',
9898
authCheckRoute: '/api/v1/protected',
9999
loginScope: 'api://5e08cf0f-53bb-4e09-9df2-e9bdc3467296/ACM.Events.Login',
100100
apiId: 'api://5e08cf0f-53bb-4e09-9df2-e9bdc3467296',

0 commit comments

Comments
 (0)