Marketing router lambda by carl-codeorg · Pull Request #64807 · code-dot-org/code-dot-org

carl-codeorg · 2025-03-25T23:06:21Z

First PR for adding the infrastructure needed to dynamically route requests to the marketing app instead of Pegasus. This PR only includes the lambda function itself and the execution role. Once this is merged, I'll follow up with a 2nd PR adding the function association to the Cloudfront distribution.

Links

Testing story

Tested that the cloudformation is valid using adhoc:cdn:validate. Ultimately we'll have to deploy for real to test this fully.

Deployment strategy

Follow-up work

Privacy

Security

Caching

PR Checklist:

Tests provide adequate coverage
Privacy and Security impacts have been assessed
Code is well-commented
New features are translatable or updates will not break translations
Relevant documentation has been added or updated
User impact is well-understood and desirable
Pull Request is labeled appropriately
Follow-up work items (including potential tech debt) are tracked and linked

cat5inthecradle

Parameterizing the marketing domain name is my strongest comment, the rest are stylistic suggestions to help simplify the code and use less erb wherever possible.

cat5inthecradle · 2025-03-26T16:25:32Z

+      Role: !GetAtt MarketingRouterLambdaRole.Arn
+      Environment:
+        Variables:
+          MARKETING_DOMAIN: dev.marketing.dev-code.org


Parameterize this so you can have different values for different stacks (environments).

For example, by adding a parameter at the top of the template.

Parameters: # ... MarketingOriginDomainName: Type: String Default: dev.marketing.dev-code.org Description: Domain name for marketing site origin. # ...

We have existing Template Parameters that we can use to construct the fully qualified domain name!

code-dot-org/aws/cloudformation/cloud_formation_stack.yml.erb

Lines 9 to 29 in 607632d

Parameters:

# ---------------------------------------------

# Domain Names - Each Stack operates 5 sites (examples are for production):

# 1) Learning Platform ("Dashboard") - https://studio.code.org

# 2) Corporate Website ("Pegasus") - https://code.org

# 3) Advocacy Website (runs on LeadPages) - https://advocacy.code.org

# 4) Hour of Code (runs on Pegasus) - https://hourofcode.com

# 5) Code Projects (host user created content) - https://codeprojects.org

# ---------------------------------------------

BaseDomainName:

Type: String

Default: <%=rack_env?(:adhoc) ? 'cdn-code.org' : "code.org" %>

Description: Base domain name for primary learning platform and corporate web site.

DashboardSubdomainName:

Type: String

Default: <%=rack_env?(:production) ? 'studio' : "#{stack_name}-studio" %>

Description: Subdomain name for learning platform ("Dashboard").

PegasusSubdomainName:

Type: String

Default: <%=rack_env?(:production) ? '\'\'' : stack_name %>

Description: Subdomain name for corporate web site ("Pegasus").

Thanks for the suggestion. I parameterized it and for now am going with marketing for the prod subdomain and {stack_name}-marketing for others. This might change before release, however.

carl-codeorg · 2025-03-26T22:48:10Z

adhoc:cdn:validate is now passing. Had one circular dependency issue that was easily fixable.

cat5inthecradle

Thanks for those changes! This is looking good so far.

When we add new resources, there's always risk of the stack update failing. Fortunately this will get deployed to all environments, so we should notice the issue in Staging and Test. If the DTP this goes out in includes database migrations, then we should watch carefully so we can respond quickly with a fix in the event of failure - as that could leave production with a new database schema but old code.

Co-authored-by: Darin Webb <darin@code.org>

- remove unnecessary cfn output - remove accidental path from lambda

Co-authored-by: suresh <suresh@code.org>

…chaining

This reverts commit e4315ac.

carl-codeorg commented Mar 26, 2025

View reviewed changes

Comment thread aws/cloudformation/cloud_formation_stack.yml.erb Outdated

carl-codeorg commented Mar 26, 2025

View reviewed changes

Comment thread aws/cloudformation/cloud_formation_stack.yml.erb Outdated

cat5inthecradle reviewed Mar 26, 2025

View reviewed changes

Comment thread aws/cloudformation/lambdas/marketing-router/index.js Outdated

cat5inthecradle approved these changes Mar 27, 2025

View reviewed changes

cat5inthecradle reviewed Mar 27, 2025

View reviewed changes

Comment thread aws/cloudformation/cloud_formation_stack.yml.erb Outdated

carl-codeorg marked this pull request as ready for review March 27, 2025 15:37

carl-codeorg requested a review from a team as a code owner March 27, 2025 15:37

sureshc reviewed Mar 27, 2025

View reviewed changes

Comment thread aws/cloudformation/cloud_formation_stack.yml.erb

sureshc reviewed Mar 27, 2025

View reviewed changes

Comment thread aws/cloudformation/cloud_formation_stack.yml.erb Outdated

stephenliang reviewed Mar 28, 2025

View reviewed changes

Comment thread aws/cloudformation/cloud_formation_stack.yml.erb

Comment thread aws/cloudformation/cloud_formation_stack.yml.erb

Comment thread aws/cloudformation/lambdas/marketing-router/index.js Outdated

kelbyhawn reviewed Mar 28, 2025

View reviewed changes

Comment thread aws/cloudformation/lambdas/marketing-router/index.js

Comment thread aws/cloudformation/cloud_formation_stack.yml.erb

stephenliang approved these changes Mar 31, 2025

View reviewed changes

sureshc reviewed Apr 4, 2025

View reviewed changes

Comment thread aws/cloudformation/lambdas/marketing-router/index.js Outdated

sureshc approved these changes Apr 11, 2025

View reviewed changes

carl-codeorg and others added 14 commits April 14, 2025 15:10

wip lambda

9495026

wip

f60293e

move cfn to main stack file

15aa2d0

use AWS::StackName and kebab case

9f01e41

Update aws/cloudformation/cloud_formation_stack.yml.erb

89e0432

Co-authored-by: Darin Webb <darin@code.org>

PR feedback

1781977

- remove unnecessary cfn output - remove accidental path from lambda

refactor service role functions into one

dfeffc0

parameterize domain name

9667742

simplify name of IAM policy

8dae6b9

resolve circular ref

b0204c4

hardcode marketing domain temporarily

4540f99

Update aws/cloudformation/cloud_formation_stack.yml.erb

b8bb150

Co-authored-by: suresh <suresh@code.org>

use optional chaining to guard against undefined props on the event

bc0cfb6

change log level to error

f5d3bed

carl-codeorg added 7 commits April 14, 2025 15:10

go back to zip_directory since uglify-es does not work with optional …

805ec07

…chaining

add permission boundary to IAM role

2e28d5c

fix export

da382c1

remove lambda environment variable

e5a849f

update function to use cfn string substitution for the domain name

6e27683

add try-catch to ensure the request is passed through

bafa72e

update to inline_js

519349e

carl-codeorg force-pushed the CMS-208/router branch from 7d9bc87 to 519349e Compare April 14, 2025 22:12

carl-codeorg merged commit e4315ac into staging Apr 15, 2025

carl-codeorg deleted the CMS-208/router branch April 15, 2025 15:42

carl-codeorg added a commit that referenced this pull request Apr 16, 2025

Revert "Marketing router lambda (#64807)"

2c5e37c

This reverts commit e4315ac.

carl-codeorg mentioned this pull request Apr 16, 2025

Revert "Marketing router lambda" #65313

Merged

carl-codeorg added a commit that referenced this pull request Apr 16, 2025

Revert "Marketing router lambda (#64807)" (#65313)

f43cad5

This reverts commit e4315ac.

	Parameters:
	# ---------------------------------------------
	# Domain Names - Each Stack operates 5 sites (examples are for production):
	# 1) Learning Platform ("Dashboard") - https://studio.code.org
	# 2) Corporate Website ("Pegasus") - https://code.org
	# 3) Advocacy Website (runs on LeadPages) - https://advocacy.code.org
	# 4) Hour of Code (runs on Pegasus) - https://hourofcode.com
	# 5) Code Projects (host user created content) - https://codeprojects.org
	# ---------------------------------------------
	BaseDomainName:
	Type: String
	Default: <%=rack_env?(:adhoc) ? 'cdn-code.org' : "code.org" %>
	Description: Base domain name for primary learning platform and corporate web site.
	DashboardSubdomainName:
	Type: String
	Default: <%=rack_env?(:production) ? 'studio' : "#{stack_name}-studio" %>
	Description: Subdomain name for learning platform ("Dashboard").
	PegasusSubdomainName:
	Type: String
	Default: <%=rack_env?(:production) ? '\'\'' : stack_name %>
	Description: Subdomain name for corporate web site ("Pegasus").

Conversation

carl-codeorg commented Mar 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Links

Testing story

Deployment strategy

Follow-up work

Privacy

Security

Caching

PR Checklist:

Uh oh!

Uh oh!

Uh oh!

cat5inthecradle left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cat5inthecradle Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

sureshc Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

carl-codeorg Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

carl-codeorg commented Mar 26, 2025

Uh oh!

cat5inthecradle left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

carl-codeorg commented Mar 25, 2025 •

edited

Loading