Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Md/issue 2074 - xpro #2132

Merged
merged 12 commits into from
Feb 8, 2024
Merged

Md/issue 2074 - xpro #2132

merged 12 commits into from
Feb 8, 2024

Conversation

Ardiea
Copy link
Member

@Ardiea Ardiea commented Feb 2, 2024

What are the relevant tickets?

#2074 - xpro

Description (What does it do?)

This sets up management of the heroku xpro config vars to be done by pulumi rather than the salt stack.

Additional Context

This is the final redacted diff between the config currently in heroku and what this code will produce.

1,2c1,2
< AWS_ACCESS_KEY_ID: AKXXXXXXXXXXXXX
< AWS_SECRET_ACCESS_KEY: K2XXXXXXXXXXXXXXXXXXXXXXXXXX
---
> AWS_ACCESS_KEY_ID: AXXXXXXXXXXXXXX
> AWS_SECRET_ACCESS_KEY: 2UXXXXXXXXXXXXXXXXXXXXXXXXXX
17c17
< DATABASE_URL: postgres://<REDACTED>:<REDACTED>@xpro-db-applications-production.cbnm7ajau6mi.us-east-1.rds.amazonaws.com:5432/xpro
---
> DATABASE_URL: postgres://<REDACTED>:<REDACTED>@xpro-db-applications-production.cbnm7ajau6mi.us-east-1.rds.amazonaws.com:5432/xpro
36d35
< HUBSPOT_API_KEY: 85xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
71,72d69
< NEW_RELIC_LICENSE_KEY: 60xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
< NEW_RELIC_LOG: stdout
87d83
< REDISCLOUD_URL: redis://default:<xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx@redis-xxxxxxxxxxxxxxxxxxxxxxxxxx:11157
120,124d115
< XPRO_CATALOG_API_URL: https://xpro.mit.edu/api/programs/
< XPRO_COURSES_API_URL: https://xpro.mit.edu/api/courses/
< XPRO_LEARNING_COURSE_ACCESS_KEY: XXXXXXXXXXXXXXXXXXXXXXXXXXX
< XPRO_LEARNING_COURSE_BUCKET_NAME: mitx-etl-xpro-production-mitxpro-production
< XPRO_LEARNING_COURSE_SECRET_ACCESS_KEY: XXXXXXXXXXXXXXXXXXXXXXX

AWS Creds are expected
DB creds are expected
HUBSPOT_API_KEY is deprecated and is now MITOL_HUBSPOT_API_PRIVATE_TOKEN
New Relic and RedisCloud comes from heroku add-ons.
XPRO_* are all deprecated: mitodl/mitxpro#2033

@Ardiea Ardiea marked this pull request as ready for review February 2, 2024 20:03
Copy link
Member

@blarghmatey blarghmatey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks good functionally. It might be good to have one of the developers working on xPro double check the values.

"MITXPRO_SECURE_SSL_REDIRECT": "True",
"MITXPRO_USE_S3": "True",
"NODE_MODULES_CACHE": "False",
"OAUTH2_PROVIDER_ALLOWED_REDIRECT_URI_SCHEMES": "http,https,dccrequest",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not specific to this PR, but wonder whether we should remove the http scheme

@Ardiea Ardiea merged commit 217c078 into main Feb 8, 2024
2 checks passed
@Ardiea Ardiea deleted the md/issue_2074 branch February 8, 2024 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants