Commit 733616a
committed
fix(ci): report malformed CTK redistrib metadata instead of tracebacking
fetch_ctk_redistrib.main() wraps everything in a deliberate handler:
except (ValueError, KeyError, OSError, urllib.error.URLError,
json.JSONDecodeError) as exc:
print(f"ERROR: {exc}", file=sys.stderr)
return 1
Several malformed-manifest shapes escape it because the guards check for
absence, not type.
1. Real redistrib_*.json files carry string-valued top-level keys --
"release_date", "release_label", "release_product" -- next to the
component objects. `metadata.get(component)` returns a str for those, and
`component_info is None` does not reject it, so `component_info.get(...)`
raises `AttributeError: 'str' object has no attribute 'get'`.
2. The manifest is downloaded with `curl -LSs` and no `--fail`
(.github/actions/fetch_ctk/action.yml), so an error page or redirect body
is written to the file. If that body is valid JSON but not an object, the
failure surfaces frames later as `TypeError: argument of type 'NoneType'
is not iterable` or `AttributeError: 'list' object has no attribute 'get'`.
3. A subdir entry that is a bare string rather than an object raises the same
AttributeError from a different line.
Reproduced via `main(argv)` with `--metadata-path`, so no network:
--component release_label -> AttributeError: 'str' object has no attribute 'get'
metadata is null -> TypeError: argument of type 'NoneType' is not iterable
metadata is a JSON array -> AttributeError: 'list' object has no attribute 'get'
subdir entry is a string -> AttributeError: 'str' object has no attribute 'get'
An absent component, by contrast, already returns 1 with a clear message.
Validate the manifest is a JSON object where it is loaded, and check the
component and subdir entries are objects before reaching into them. Also
replace `ctk_subdir in metadata.get(resolved_component, {})` in
filter_components with an explicit dict check: on a string value that `in`
silently becomes a substring test rather than a key lookup.
Adds the first tests for this tool.1 parent 3bd069a commit 733616a
2 files changed
Lines changed: 149 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
| 73 | + | |
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
78 | | - | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
79 | 92 | | |
80 | 93 | | |
81 | 94 | | |
| |||
101 | 114 | | |
102 | 115 | | |
103 | 116 | | |
104 | | - | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
105 | 122 | | |
106 | 123 | | |
107 | 124 | | |
| |||
114 | 131 | | |
115 | 132 | | |
116 | 133 | | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
117 | 141 | | |
118 | 142 | | |
119 | 143 | | |
120 | 144 | | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
121 | 150 | | |
122 | 151 | | |
123 | 152 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
0 commit comments