Commit 9652a08
authored
fix: pass resource aliases to file-level CommonResources (#16945)
File-level resources (like imported dependencies) were previously
starved of CLI aliases during dummy MessageType creation. This caused
false-positive namespace collisions because the collision checker
couldn't see the explicit aliases.
This wires `opts.resource_name_aliases` down through api.py into
`CommonResource.build()` so the alias resolution works as originally
intended.
Fixes: #169521 parent 1718e31 commit 9652a08Copy full SHA for 9652a08
2 files changed
+7-3Lines changed: 7 additions & 3 deletions
File tree
Expand file treeCollapse file tree
Open diff view settings
Filter options
- packages/gapic-generator/gapic/schema
Expand file treeCollapse file tree
Open diff view settings
Collapse file
packages/gapic-generator/gapic/schema/api.py
Copy file name to clipboardExpand all lines: packages/gapic-generator/gapic/schema/api.py+3-1Lines changed: 3 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
101 | 101 | |
102 | 102 | |
103 | 103 | |
| 104 | + |
104 | 105 | |
105 | 106 | |
106 | 107 | |
| ||
159 | 160 | |
160 | 161 | |
161 | 162 | |
162 | | - |
| 163 | + |
163 | 164 | |
164 | 165 | |
165 | 166 | |
| ||
1214 | 1215 | |
1215 | 1216 | |
1216 | 1217 | |
| 1218 | + |
1217 | 1219 | |
1218 | 1220 | |
1219 | 1221 | |
|
Collapse file
packages/gapic-generator/gapic/schema/wrappers.py
Copy file name to clipboardExpand all lines: packages/gapic-generator/gapic/schema/wrappers.py+4-2Lines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
2081 | 2081 | |
2082 | 2082 | |
2083 | 2083 | |
| 2084 | + |
2084 | 2085 | |
2085 | 2086 | |
2086 | | - |
2087 | | - |
| 2087 | + |
| 2088 | + |
2088 | 2089 | |
2089 | 2090 | |
2090 | 2091 | |
| ||
2098 | 2099 | |
2099 | 2100 | |
2100 | 2101 | |
| 2102 | + |
2101 | 2103 | |
2102 | 2104 | |
2103 | 2105 | |
|
0 commit comments