Creates 'version.json' in each plugin directory. Closes #3492 #3494
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
binaek
force-pushed
the
3492-plugin-install-should-create-individual-version-files-along-side-the-plugin-binary
branch
2 times, most recently
from
ce83acf
to
c1c1282
Compare
binaek
force-pushed
the
3492-plugin-install-should-create-individual-version-files-along-side-the-plugin-binary
branch
from
8f816ad
to
03bb3e8
Compare
This reverts commit d813338.
binaek
force-pushed
the
3492-plugin-install-should-create-individual-version-files-along-side-the-plugin-binary
branch
from
d813338
to
928a5fb
Compare
kaidaguerre
requested changes
Jun 27, 2023
cmd/root.go
Outdated
| @@ -96,6 +96,13 @@ var rootCmd = &cobra.Command{ | |||
| // runScheduledTasks skips running tasks if this instance is the plugin manager | |||
| waitForTasksChannel = runScheduledTasks(cmd.Context(), cmd, args, ew) | |||
|
|
|||
| // decompose the plugin version file | |||
There was a problem hiding this comment.
what does // decompose the plugin version file mean?
How about
// ensure all plugin installation directories have a version.json file
// (this is to handle the case of migrating an existing installation to v0.21)
cmd/root.go
Outdated
Comment on lines
100
to
101
| // no point doing this for the plugin-manager since that would have been done | ||
| // by the initiating CLI process anyway |
There was a problem hiding this comment.
// no point doing this for the plugin-manager since that would have been done by the initiating CLI process
| var versionFileUpdateLock = &sync.Mutex{} | ||
|
|
||
| func updateVersionFilePlugin(image *SteampipeImage) error { | ||
| func updatePluginVersionFiles(image *SteampipeImage) error { |
There was a problem hiding this comment.
comment - what does this function do
pkg/ociinstaller/plugin.go
Outdated
| @@ -73,23 +72,31 @@ func updateVersionFilePlugin(image *SteampipeImage) error { | |||
|
|
|||
| pluginFullName := image.ImageRef.DisplayImageRef() | |||
|
|
|||
| plugin, ok := v.Plugins[pluginFullName] | |||
| installation, ok := v.Plugins[pluginFullName] | |||
There was a problem hiding this comment.
what is installation ?
should it be installedVersion
pkg/ociinstaller/plugin.go
Outdated
|
|
||
| v.Plugins[pluginFullName] = installation | ||
|
|
||
| // Ensure that the version file is written. |
There was a problem hiding this comment.
// Ensure that the version file is written to the plugin installation folder
| const ( | ||
| PluginStructVersion = 20220411 | ||
| pluginVersionFileName = "version.json" | ||
| ) | ||
|
|
||
| type PluginVersionFile struct { |
There was a problem hiding this comment.
is this the top level version file?
a comment is probably worthwhile
| @@ -37,26 +54,26 @@ func (f *PluginVersionFile) MigrateFrom() migrate.Migrateable { | |||
| return f | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
I'm not loving the force
| }) | ||
|
|
||
| if err != nil { | ||
| log.Println("[TRACE]", "error while walking plugin directory for version files", err) |
There was a problem hiding this comment.
"recomposePluginVersionFile failed - error while walking plugin directory for version files", err)
pkg/plugin/actions.go
Outdated
| item.Version = installation.Version | ||
| // but if the modtime of the binary is after the installation date, | ||
| // this is "local" | ||
| installDate, err := time.Parse(time.RFC3339, installation.InstallDate) |
There was a problem hiding this comment.
can you extract a detectLocalPlugin function to do most of this?
| @@ -84,12 +101,109 @@ func (f *PluginVersionFile) write(path string) error { | |||
| return os.WriteFile(path, versionFileJSON, 0644) | |||
| } | |||
|
|
|||
| // delete the file on disk if it exists | |||
| func (f *PluginVersionFile) delete() { | |||
| func (f *PluginVersionFile) backfill() error { | |||
There was a problem hiding this comment.
comment
I'm also not convince backfill is the best function name - can we be more descriptive?
kaidaguerre
deleted the
3492-plugin-install-should-create-individual-version-files-along-side-the-plugin-binary
branch
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.
No description provided.