Storewolf: adds feature to create inventory file symlink #3035
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jpmcb
force-pushed
the
storewolf-symlink
branch
from
dbb6683
to
c97c5ba
Compare
webern
reviewed
Apr 19, 2023
|
Needs a rebase and |
jpmcb
force-pushed
the
storewolf-symlink
branch
from
c97c5ba
to
8365f0c
Compare
bcressey
reviewed
Apr 19, 2023
jpmcb
force-pushed
the
storewolf-symlink
branch
from
8365f0c
to
9d6274a
Compare
|
Force pushed to address Ben's comments on deleting the symlink (if it's there) before attempting to create it. |
jpmcb
force-pushed
the
storewolf-symlink
branch
from
9d6274a
to
3b3f46b
Compare
|
Force pushed to address Zac's comment: now use two different |
jpmcb
force-pushed
the
storewolf-symlink
branch
2 times, most recently
from
f3c66d4
to
29469e5
Compare
|
Force pushed to add migration and rebase on |
jpmcb
force-pushed
the
storewolf-symlink
branch
from
29469e5
to
bdb3ad5
Compare
|
Force pushed for |
webern
approved these changes
Apr 25, 2023
jpmcb
force-pushed
the
storewolf-symlink
branch
from
bdb3ad5
to
23ab5a4
Compare
|
Rebased to fix merge conflict in |
bcressey
approved these changes
Apr 26, 2023
Comment on lines
25
to
45
| /// On downgrade, the inventory directory (and its content) needs to be | ||
| /// deleted (see above). Also note, the "remove_dir_all" function will not | ||
| /// **not** follow symbolic links and it will simply remove the symbolic | ||
| /// link itself (which is exactly what we want). | ||
| fn backward(&mut self, input: MigrationData) -> Result<MigrationData> { | ||
| println!( | ||
| "Deleting inventory Bottlerocket directory: '{}'", | ||
| INVENTORY_SYMLINK_PATH | ||
| ); | ||
| if let Err(e) = fs::remove_dir_all(INVENTORY_SYMLINK_PATH) { | ||
| if e.kind() != io::ErrorKind::NotFound { | ||
| return Err(e).context(error::RemoveFileSnafu { | ||
| path: INVENTORY_SYMLINK_PATH, | ||
| }); | ||
| } else { | ||
| println!("NotFound: '{}'", INVENTORY_SYMLINK_PATH) | ||
| } | ||
| } | ||
| Ok(input) | ||
| } | ||
| } |
There was a problem hiding this comment.
A migration for this seems like overkill. I'm not opposed to including it but I don't see any real upside.
Signed-off-by: John McBride <jpmmcb@amazon.com>
jpmcb
force-pushed
the
storewolf-symlink
branch
from
23ab5a4
to
9811bb8
Compare
|
Force pushed to remove migration per @bcressey! Will merge once tests pass again! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue number:
Closes #2967
Description of changes:
Feature for
storewolfto create a symlink at a given path and destination:/usr/bin/storewolf \ --data-store-base-path /var/lib/bottlerocket/datastore \ --inventory-file-symlink-path /var/lib/bottlerocket/inventory/application.jsonwill then create the a symlink to the default file location
/usr/share/bottlerocket/application-inventory.json. Users may also specify the source location of the inventory file via the optional--inventory-file-pathflag.Testing done:
Built bottlerocket, launched instance and see symlink created correctly:
Contents looks good:
And bootlogs look good:
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.