GCE: Add 'tf-network' to the list of protected networks #328
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #328 +/- ##
==========================================
+ Coverage 79.11% 79.12% +0.02%
==========================================
Files 22 22
Lines 1656 1657 +1
==========================================
+ Hits 1310 1311 +1
Misses 346 346 ☔ View full report in Codecov by Sentry. |
pdostal
force-pushed
the
gce_terraform
branch
from
b906aaf to
7726a6d
Compare
ocw/lib/gce.py
Outdated
| @@ -11,7 +12,11 @@ | |||
|
|
|||
| class GCE(Provider): | |||
| __instances = {} | |||
| __skip_networks = frozenset({"default"}) | |||
|
|
|||
| if PCWConfig.has('cleanup/gce-skip-networks'): | |||
There was a problem hiding this comment.
__skip_networks = frozenset(ConfigFile().getList('cleanup/gce-skip-networks', "default")) - will replace whole if/else block
There was a problem hiding this comment.
No. The .getList() does not have 'default value'.
There was a problem hiding this comment.
https://github.com/SUSE/pcw/blob/master/webui/PCWConfig.py#L47
def getList(self, config_path: str, default: list = None) -> list:
if default is None:
default = []
return [i.strip() for i in self.get(config_path, ','.join(default)).split(',')]
and what about second parameter named default ?
There was a problem hiding this comment.
so what do you suggest me to do?
There was a problem hiding this comment.
replace
if PCWConfig.has('cleanup/gce-skip-networks'):
__skip_networks = frozenset(ConfigFile().getList('cleanup/gce-skip-networks'))
else:
__skip_networks = frozenset({"default"})
with one-liner __skip_networks = frozenset(ConfigFile().getList('cleanup/gce-skip-networks', "default")) unless I am missing something your 4 lines and mine one-liner suppose to do exactly same thing 🤔
pdostal
force-pushed
the
gce_terraform
branch
6 times, most recently
from
012297e to
386a95c
Compare
In GCE the networking and security resources don't have tags neither metadata. Also the delete protection feature isn't available for those. Instead, all of those resources have link to the 'network' resource, which we have whitelist for. So I: 1) Make this whitelist of GCE `skip-networks` configurable in `pcw.ini` 2) Add `tf-network` to this list (see https://gitlab.suse.de/qac/terraform)
pdostal
force-pushed
the
gce_terraform
branch
from
386a95c to
775b7be
Compare
In GCE the networking and security resources don't have tags neither metadata.
Also the delete protection feature isn't available for those. Instead,
all of those resources have link to the 'network' resource, which we
have whitelist for. So I:
skip-networksconfigurable inpcw.initf-networkto this list (see https://gitlab.suse.de/qac/terraform)