Consolidate walle_env_vars #12
Conversation
tasks/main.yml
Outdated
| ansible.builtin.lineinfile: | ||
| path: "{{ walle_bashrc }}" | ||
| regexp: "^export {{ item.key }}=" | ||
| line: 'export {{ item.key }}="{{ item.value }}"' | ||
| with_items: "{{ walle_env_vars }}" | ||
|
|
||
| - name: Add env variables for user deletion (WallE) | ||
| - name: Extend walle_bashrc with user-defined walle_extra_env_vars |
There was a problem hiding this comment.
The env vars in the list are merged right? Because if walle_extra_env_vars does not overwrite the walle_env_vars, I would think, these two tasks might overwrite each other on every run, which works, but is not ideal, because it would show changed in the ansible output
There was a problem hiding this comment.
Yes good point, not ideal! I just changed walle_env_vars to a dict so they can be overridden easily before templating. I think that's a cleaner way to do it?
| with_items: "{{ walle_env_vars }}" | ||
| - name: Extend walle_env_vars with user-defined walle_extra_env_vars | ||
| ansible.builtin.set_fact: | ||
| walle_env_vars: "{{ walle_env_vars | combine(walle_extra_env_vars) }}" |
|
|
||
| # delete users when malware was found and malware severity reached walle_delete_threshold | ||
| walle_api_key: null # admin api key to delete users, goes to VAULT |
There was a problem hiding this comment.
They're not appended to the bashrc when null, because they are removed by the combine filter, right?
There was a problem hiding this comment.
Good question - they are not removed but rendered in walle_bashrc like:
export GALAXY_API_KEY=""
export GALAXY_BASE_URL=""
I think the result in walle.py is the same as if they were unset:
try:
if len(from_env := os.environ.get(env, "").strip()) == 0:
raise ValueError
else:
return from_env
except ValueError:
logger.error(f"Path for %s is invalid", env)
raise ValueErrorAre you happy with that?
There was a problem hiding this comment.
Yes, sorry for being over-accurate
There was a problem hiding this comment.
Not at all - I appreciate your eyes! 😄
|
@mira-miracoli To get this installable with ansible-galaxy do we just make another release? 0.0.3? |
|
I would like to stick to semantic versioning and if everything works, maybe we could release 1.0.0? |
|
Sounds good to me - I haven't tested your |
Resolves #9