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.

Sign up for GitHub

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

Jump to bottom

Modularization and cleaning of the glidein_startup.sh script #197

Open
wants to merge 159 commits into
base: master
Choose a base branch
from
Open

Modularization and cleaning of the glidein_startup.sh script #197

wants to merge 159 commits into from

Conversation

terranovafr
Copy link
Contributor

@terranovafr terranovafr commented Aug 11, 2022 •
edited
Loading

In this pull request, I attach the current evolving draft of the modularization and cleaning of the glidein_startup.sh script.
Division in modules:

  • glidein_startup.sh: revised and reduced
  • glidein_cleanup.sh: functions regarding the glidein termination and cleanup
  • utils_*.sh: utility functions regarding * (crypto, io, signals, tarballs, params, xml)
  • utils_gs_*.sh: utility functions specific for the glidein_startup regarding * (filesystem, http, io, signals, tarballs)

Most relevant modifications:

  • local scope of some variables which were global but used only in that function
  • definition of the create_xml function for creating xml strings and print_header_line for printing header strings
  • grouped some code blocks in functions
  • added comments explaining for each function the arguments, global variables used, the returned values and the environment

@terranovafr
Divided glidein_startup.sh in modules
0b67809
@terranovafr
Added debug option
7b0f554
@terranovafr
Added manual installation script for testing
4569245
@terranovafr
Modified menu
b9254e4
@terranovafr
Solved error printf
39265e5
@terranovafr
Modified manual installation
31ce38c
@terranovafr
Updated functions' comments
e7d47d7
@terranovafr
Fixed some comments
bc9a8ee
@terranovafr
Marked some useless global variables as local
8d55fb0
@terranovafr
Marked more global variables as local
fdb4a35
@terranovafr
Changed debug option
11bc513
@terranovafr
Modified print_header error handling
44a88aa
@terranovafr
Modified print_header error handling
8216550
@terranovafr
Handled exit status
917c2f4
@terranovafr
Added first xml change
35b4872
@terranovafr
Added first xml change
9f5461c
@terranovafr
Added first xml change
fe68b84
@terranovafr
Added first xml change
f816366
@terranovafr
Added first xml change
1e4af33
@terranovafr
Added xml changes
0a2cf42
@terranovafr
Added xml changes
566df04
@terranovafr
Added spaces support to create_xml method
e669a0f
@terranovafr
Substitution of two methods with the call to the create_xml method
5adba35
@terranovafr
Substitution of two methods with the call to the create_xml method
5ae02ef
@terranovafr
Substitution of the methods of utils_http with the call to the create…
db70155 
…_xml method
@terranovafr
Substitution of the methods of utils_http with the call to the create…
21e2aa3 
…_xml method
@terranovafr
Substitution of the methods of utils_http with the call to the create…
d1b8ead 
…_xml method
@terranovafr
Completed substituion of xml methods
64f6c5a
@terranovafr
Completed substituion of xml methods
880f7dd
@terranovafr
Methods divided among glidein startup specific methods and general me…
49845aa 
…thods
terranovafr and others added 23 commits September 16, 2022 16:20
@terranovafr
Added the removal of the logs directory generated during the test
8a462d5
@terranovafr
Added the tests regarding the write permission
84a57f9
@terranovafr
Added the tests regarding the write permission
7349204
@terranovafr
Cleaned up code (removed some echos and fixed some local variables)
028fd48
@pre-commit-ci @terranovafr
[pre-commit.ci] auto fixes from pre-commit.com hooks
dbbd7d6 
for more information, see https://pre-commit.ci
@terranovafr
Cleaned up code (fixed the scope of some variables)
f0211f7
@pre-commit-ci @terranovafr
[pre-commit.ci] auto fixes from pre-commit.com hooks
84f9617 
for more information, see https://pre-commit.ci
@terranovafr
Updated paths of the test files to filenames in /tmp.
2480d95 
Some files' position has not been modified since it is expected to be found in certain positions inside the scripts.
@terranovafr
Re-committing for testing the timeout feature of the bats tests.
3b1a5d7
@terranovafr
Applied some of the modifications requested.
3354fa0 
Modified comments structure, moved the license on top, moved utils_tarballs.sh functions to glidein_startup.sh, and renamed some functions.
@terranovafr
Updated globals/used comments about functions.
eb788bf
@terranovafr
Modified some file names and solved some bugs in bats tests.
8579aea
@terranovafr
Modified some file names and solved some bugs in bats tests.
3228c21
@terranovafr
Corrected create_glidein_config bats test
4bca06b
@terranovafr
Made the modifications requested by the review (mainly glidein_startu…
186849f 
…p and utils_gs_signals) and adapted bats tests.
@terranovafr
Made the modifications requested by the second review (mainly about u…
6ef99b1 
…tils_log and utils_xml) and adapted bats tests.
@terranovafr
Applied modifications to the prepare_workdir function considering the…
120d6b3 
… original repo's modifications to the glidein_startup.sh script.
@terranovafr
Applied modifications considering the original repo's modifications t…
659d916 
…o the glidein_startup.sh script.
@terranovafr
Performed last modifications after merging with original repo's behin…
648b48a 
…d commits.
@terranovafr
Merge remote-tracking branch 'origin/master'
ddeec6a 
# Conflicts:
#	creation/web_base/glidein_cleanup.sh
#	creation/web_base/glidein_startup.sh
#	creation/web_base/utils_gs_filesystem.sh
#	test/bats/creation_web_base_glidein_cleanup.bats
#	test/bats/creation_web_base_utils_gs_filesystem.bats
@terranovafr
Removed prepare_workdir bats test
df079da
@terranovafr
Changed output definition avoiding awk
bba725c
@terranovafr
Moved functions with many global variables (lot of collateral effects…
860db8d 
…) from the modules to glidein_startup.sh and re-adapted bats tests.
@mambelli mambelli mentioned this pull request Sep 28, 2022
Open
@mambelli
Copy link
Contributor

mambelli commented Oct 5, 2022

Better rebase os this PR: mambelli#12

@namrathaurs namrathaurs modified the milestones: 3.11.0, 3.11.1 Feb 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mambelli mambelli mambelli requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
rel:3.11.0 Release label for v3.11.0
Projects
None yet
Milestone
3.11.0
Development

Successfully merging this pull request may close these issues.
5 participants
@terranovafr @mambelli @namrathaurs @mmascher @BrunoCoimbra