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

Uses a dedicated setting to generate the magma VITE_CALDERA_URL variable #2994

Merged
merged 1 commit into from
Jun 20, 2024

Conversation

jbaptperez
Copy link
Contributor

@jbaptperez jbaptperez commented Jun 4, 2024

Description

Fix proposal for issue #2984, using a dedicated setting to be properly transferred to the magma's .env file when using the --build option.

The setting name can be changed if needed.

Note the related issue is linked to a more general topic about configuration variables: Separating server listening settings, (HTTP) client and contact (agent) ones.

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Locally tested.

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works

Copy link
Contributor

@djlawren djlawren left a comment

Choose a reason for hiding this comment

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

Tested on remote host and localhost. All good from my perspective.

We are considering how to effectively document the login bug and mitigation going forward, but that shouldn't block these changes.

@jbaptperez jbaptperez force-pushed the fix/magma-env-file branch from 021054b to 3784390 Compare June 17, 2024 07:35
The generated .env file used "host" and "port" settings which were not
suitable for client URL generation (they are HTTP server listening
settings, not client URL components).
@jbaptperez jbaptperez force-pushed the fix/magma-env-file branch from 3784390 to 0626285 Compare June 18, 2024 14:23
@signaledge
Copy link

@djlawren We are deploying a caldera instance on EC2, trying to expose the GUI over the public IP - we ran into a lot of issues, which this MR should be fixing (we have a small similar patch which proves to be working). Could this please be merged asap, to facilitate other users and our deployment ?

@djlawren
Copy link
Contributor

Opened corresponding documentation PRs: #3006, mitre/fieldmanual#126

@djlawren We are deploying a caldera instance on EC2, trying to expose the GUI over the public IP - we ran into a lot of issues, which this MR should be fixing (we have a small similar patch which proves to be working). Could this please be merged asap, to facilitate other users and our deployment ?

Noted on the urgency, apologies for the delays here. On to @elegantmoose now to review and merge.

@elegantmoose
Copy link
Contributor

@prose-leviathan My bad.

@elegantmoose elegantmoose merged commit d18788a into mitre:master Jun 20, 2024
1 of 6 checks passed
@jbaptperez jbaptperez deleted the fix/magma-env-file branch June 20, 2024 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants