-
Notifications
You must be signed in to change notification settings - Fork 929
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
Dynamic filename generation #3222
base: master
Are you sure you want to change the base?
Conversation
I had toyed around with this in master...filename - it has bit more flexibility into how to name the file, but no fetch method. The fecth method is tricky with arbitrary filename. |
You are right. |
I can't think of better solution, than that, if we mean |
@ytti I think i have done |
I am bit on the fence, why this is the right approached compared to my approach, which affects all outputs. Why wouldn't there be anyone who would want to emit like NOS/device? Instead of device, as file name to git? |
You might be right, but I think that providing the same functionality on other outputs require more care on the filename format validation. |
Yeah I'm not sure #fetch is going to be reliable anyhow. I'm also skeptical if you can flatten the opts safely. And I don't think your version supports passing directory as part of filename, and I think my version supports that. So maybe you want yyyy/mm/filename, idk. Generally, I don't have too good feeling about convergence of feature being needed and quality of implementation. It's not very important feature, I think, therefore it probably should be very well implemented to justify complexity. |
On top of my branch changes, I was thinking maybe 'fetch' can work, because we store the name. So we don't have to try to infer it? Like so: diff --git a/lib/oxidized/output/file.rb b/lib/oxidized/output/file.rb
index 70a8cd3..40c67d9 100644
--- a/lib/oxidized/output/file.rb
+++ b/lib/oxidized/output/file.rb
@@ -29,7 +29,7 @@ module Oxidized
def fetch node, group
cfg_dir = File.expand_path @cfg.directory
- node_name = name(node)
+ node_name = node.output.name || node.name
if group # group is explicitly defined by user
cfg_dir = File.join File.dirname(cfg_dir), group
diff --git a/lib/oxidized/output/output.rb b/lib/oxidized/output/output.rb
index a120373..cb8fb65 100644
--- a/lib/oxidized/output/output.rb
+++ b/lib/oxidized/output/output.rb
@@ -1,6 +1,7 @@
module Oxidized
class Output
class NoConfig < OxidizedError; end
+ attr_accessor :name
def cfg_to_str cfg
cfg.select { |h| h[:type] == 'cfg' }.map { |h| h[:data] }.join
@@ -22,7 +23,7 @@ module Oxidized
minute: "%02d" % time.min,
second: "%02d" % time.sec,
}
- name_str % map
+ @name = name_str % map
end
end
end I'm not sure I like node_name = node.output.name || node.name, I do wonder if I rather want to use node.output.name explicitly, and guarantee it is always populated either with node.name or via the user configured string template. |
I'm not sure how to deal with this PR. My impression is that the discussion between @ytti and @Filippo125 is not finished. If this PR has to be merged into master, I need first:
When these points have been completed, I could make a review of the code. I've got the feeling that node.email is the email from the commit and that fetch won't work for commits triggered by oxidized-web (/next). I'm sorry being somewhat overcautious here, the PR introduces complexity and I don't understand its benefits yet - if I need history, the git output seems a better alternative to me. |
I'm testing the solution on real field at the moment. |
I'm less concerned about the complexity of the code than about de potential security implications of the PR and potential corner cases not working (fetch). It may be better to create a dedicated output for it ( It would help me to understand your use case. How does your output.file.filename looks like? |
I try to explain my use case better. source:
default: csv
csv:
file: "/workspaces/oxidized/local_dev/device.csv"
delimiter: !ruby/regexp /:/
map:
name: 0
ip: 1
model: 2
username: 3
password: 4
vars_map:
uuid: 5
location: 6 In the backup file i would to customise at least the filename output using something coming from the vars_map. In the best option also the directory (but for my use case, it is not mandatory). PS: The same should be applied also in the hook, especially for exec hook. |
Thank you for the explanation. I have a similar use-case. I passed the attributes city and street as the group "city/street", without modifying the filename, wich produces a nice tree and paths like I'm still weighing the pros and cons of this PR (or the option you propose - just changing the methods and letting the custom output out of oxidized). I need some more time for this, I'll get back to you after it. |
Okay, so after some reflexion, I think this PR should be changed in following points:
Please also note that another PR has been merged into main, introducing a Namespace Oxidized::Output for outputs. This will impact your code. Sorry for the collision 😅. I've understood the use case, and I'd like to thank you for the effort of writing this PR, including attributes you don't need yourself (date). I am aware that the points above mean more work, I hope that they do not seem exaggerated to you. If you need some help, especially the unit tests can be time consuming, just let me know. I have write access to the PR so I can directly contribute code into it. |
I'm not really sure I agree it should be another output model. I agree we have some icky problems, but I don't see how another output class solves any of those icky problems. The implementation my branch proposes hardly even cares about output, and it can be used for any output at all, if we want to manipulate the name somehow. And it does nothing in any output, if the variable is not set. I also feel it is vastly simpler and more maintainable approach than the proposed approach. I do feel like mangled output name can be useful regardles of output class. But I'm not sure it's useful enough to justify the cost. |
So, maybe the best option at the moment is close these PR. I would like to open a new one only to change the parameters passed in the method to give us the flexibility to use all the fields in the object. Let me know |
It seems to me that we currently cannot find a common position on this PR. I understand the point of @ytti, but it does not support node variables, and I have other currently priorities than investing time into it. So your proposition to close the PR and only changing the parameters passed in output.store seem the most reasonable option to me. |
Pre-Request Checklist
rubocop --auto-correct
)rake test
)Description
Add support for dynamic file name based on the attribute present in the node object
Add support for time date in the filename. See PR1462