DMC/scipro
7
0
Fork 0
Code Issues 20 Pull Requests 1 Actions Projects 1 Wiki Activity

Automate deployment of pull requests #15

Merged
tozh4728 merged 3 commits from branch-deploy into develop 2024-12-19 10:44:49 +01:00
Conversation 3 Commits 3 Files Changed 10 +281 -9
ansv7779 commented 2024-11-06 20:11:20 +01:00
Owner
Copy Link

Click link and see that system is working. Log in using the principal admin@example.com. Change something in the deployed system. Re-run the action. See that the database has reset.

Major change Added OAuth 2 login so no longer need modified web.xml with filter. Run docker compose up to start the local OAuth 2 authorization server to log in. Use the custom ticket form and enter the username you want to log in as in the "Principal" field.

Squashed all migrations since there are faulty ones that can't be applied to an empty database.

Click link and see that system is working. Log in using the principal `admin@example.com`. Change something in the deployed system. Re-run the action. See that the database has reset. **Major change** Added OAuth 2 login so no longer need modified web.xml with filter. Run `docker compose up` to start the local OAuth 2 authorization server to log in. Use the custom ticket form and enter the username you want to log in as in the "Principal" field. Squashed all migrations since there are faulty ones that can't be applied to an empty database.
ansv7779 added 5 commits 2024-11-06 20:11:20 +01:00 
Was caused by a refactor that removed the credits used to differentiate project types while master and one-year master were the same. Now it is different types and the credits were no longer needed and got removed.
There are migrations that do not work on an empty database (372) and many others that give deprecated warnings that will stop working in the future.

This change runs all the migrations (with a fixed 372) and then takes a dump of the result and uses that as a new baseline migration for Flyway. Baselines are meant for existing databases where Flyway is introduced so to fool Flyway into baselining we change the table Flyway uses from the old schema_version to the new flyway_schema_history (default).

The new baseline has no warnings and no invalid migrations and can be run on both empty databases and existing ones.

While Flyway has support for this type of a new baseline (or state scripts), that is only available in the paid editions and not the community version.
In case the user has no profile (first time logging in) it tries to create one.
Since there is no transaction running it fails to save this profile.
Switch to Spring Security for authentication and allow local OAuth 2 log in
All checks were successful
Build and test / build-and-test (push) Successful in 6m33s
Details
58c395e495 
Instead of storing the current user in the Wicket session, let Spring Security handle it. The CurrentUser implementation has been changed to look it up from there instead of the Wicket session.

Also enable, in addition to Shibboleth (pre-authenticated remote user), OAuth 2 login which removes the need for the locally modified web.xml with a faked remote user. The Docker Compose file has been updated to run a OAuth 2 container for this type of login.

The "import user from external services upon successful login" has unfortunately been removed. However since there are batch jobs that do this every day this should not be noticeable.
Attempt at automatic deployment
All checks were successful
Build and test / build-and-test (push) Successful in 6m46s
Details
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 4m4s
Details
269bb71f56
gitea-actions commented 2024-11-06 20:15:25 +01:00
First-time contributor
Copy Link

Deployed to https://scipro-branch-deploy.branch.dsv.su.se

Deployed to https://scipro-branch-deploy.branch.dsv.su.se
ansv7779 force-pushed branch-deploy from 269bb71f56 to a2b06900de 2024-11-06 20:20:56 +01:00 Compare
ansv7779 force-pushed branch-deploy from a2b06900de to a90c94d92b 2024-11-06 20:24:51 +01:00 Compare
ansv7779 force-pushed branch-deploy from a90c94d92b to 493e06c825 2024-11-20 16:52:30 +01:00 Compare
ansv7779 force-pushed branch-deploy from 493e06c825 to 0e37f0299c 2024-11-21 10:55:11 +01:00 Compare
ansv7779 added 1 commit 2024-11-21 13:07:37 +01:00
Remove Shibboleth (SAML) log in
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 3m53s
Details
Build and test / build-and-test (push) Successful in 7m6s
Details
51d7c88e97 
Tomcat/Apache integration for SAML will populate the ServletRequest#getRemoteUser with an empty string rather than null when not authenticated. This confuses Spring Security to think the user is authenticated but with an empty string as the principal name. This causes problems further down the line in Spring Security since an empty principal is not accepted.

To get around this we simply remove the SAML integration and rely solely on OAuth 2.0 for log in. An alternative would be to apply a servlet filter beforehand that would send null if the string is empty. But that has the downside of having different authentication mechanism for production and development. By using only OAuth 2.0 everywhere it works the same, and it is easier to troubleshoot.
ansv7779 force-pushed branch-deploy from 51d7c88e97 to be46db9528 2024-11-21 23:09:53 +01:00 Compare
ansv7779 force-pushed branch-deploy from be46db9528 to 69aa454b8e 2024-12-10 11:43:19 +01:00 Compare
ansv7779 force-pushed branch-deploy from 69aa454b8e to 07af176d7c 2024-12-16 23:53:39 +01:00 Compare
ansv7779 force-pushed branch-deploy from 07af176d7c to f6ede7a83b 2024-12-17 00:14:36 +01:00 Compare
ansv7779 force-pushed branch-deploy from f6ede7a83b to 24dc32306e 2024-12-17 11:11:36 +01:00 Compare
ansv7779 changed title from WIP: Automate deployment of pull requests to Automate deployment of pull requests 2024-12-17 11:53:29 +01:00
ansv7779 commented 2024-12-17 11:57:36 +01:00
Author
Owner
Copy Link

Deployed to https://scipro-branch-deploy.branch.dsv.su.se

How to test

  1. Click the above link
  2. Log in as the "default user" (issue ticket in the upper form)
  3. Bask in the glory that is a automatically spun up test server with this PRs changes
  4. Navigate to /logout to log out
  5. Use the lower form to log in as eric@example.com or sture@example.com to test as a different user (can also use the built-in switch user if you logged in as an admin)
> Deployed to https://scipro-branch-deploy.branch.dsv.su.se ## How to test 1. Click the above link 2. Log in as the "default user" (issue ticket in the upper form) 3. Bask in the glory that is a automatically spun up test server with this PRs changes 4. Navigate to `/logout` to log out 5. Use the lower form to log in as `eric@example.com` or `sture@example.com` to test as a different user (can also use the built-in switch user if you logged in as an admin)
ansv7779 added 1 commit 2024-12-17 12:02:37 +01:00
Document how the test servers work and how to use them
All checks were successful
Deploy to branch.dsv.su.se / deploy (pull_request) Successful in 33s
Details
Build and test / build-and-test (push) Successful in 15m48s
Details
Remove branch deployment from branch.dsv.su.se / cleanup (pull_request) Successful in 20s
Details
1939a24c6e
tozh4728 approved these changes 2024-12-19 10:44:33 +01:00
tozh4728 merged commit 323d6fc61e into develop 2024-12-19 10:44:49 +01:00
tozh4728 deleted branch branch-deploy 2024-12-19 10:44:49 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
tozh4728
Labels
Clear labels
bug
Something is not working
discussion
duplicate
This issue or pull request already exists
enhancement
New feature
frozen
The issue is not solved, but it will be investigated in the future it the issue arises again
help wanted
Need some help
invalid
Something is wrong
new
To be discussed at the next meeting
po
approved
po
needed
question
More information is needed
size
1
size
2
size
3
wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: DMC/scipro#15
No description provided.
Delete Branch "branch-deploy"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?