Skip to content

Commit 7663fdc

Browse files
jskeetjskeet
authored
fix(internal/stategen): be more conservative about removing OwlBot lines (googleapis#13106)
Previously, migrating module "iam" would remove all lines containing "/iam/" - even if they weren't in the iam module.
1 parent 8ebb896 commit 7663fdc

File tree

5 files changed

+100
-27
lines changed

5 files changed

+100
-27
lines changed

‎.github/.OwlBot.yaml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ deep-remove-regex:
9494
- /gkehub/apiv1beta1/
9595
- /gkemulticloud/apiv1/
9696
- /gsuiteaddons/apiv1/
97-
- /iam/apiv1/
98-
- /iam/apiv2/
99-
- /iam/apiv3/
100-
- /iam/apiv3beta/
101-
- /iam/credentials/apiv1/
10297
- /iap/apiv1/
10398
- /identitytoolkit/apiv2/
10499
- /ids/apiv1/
@@ -192,11 +187,6 @@ deep-remove-regex:
192187
- /internal/generated/snippets/gkehub/apiv1beta1/
193188
- /internal/generated/snippets/gkemulticloud/apiv1/
194189
- /internal/generated/snippets/gsuiteaddons/apiv1/
195-
- /internal/generated/snippets/iam/apiv1/
196-
- /internal/generated/snippets/iam/apiv2/
197-
- /internal/generated/snippets/iam/apiv3/
198-
- /internal/generated/snippets/iam/apiv3beta/
199-
- /internal/generated/snippets/iam/credentials/apiv1/
200190
- /internal/generated/snippets/iap/apiv1/
201191
- /internal/generated/snippets/identitytoolkit/apiv2/
202192
- /internal/generated/snippets/ids/apiv1/
@@ -763,16 +753,6 @@ deep-copy-regex:
763753
dest: /
764754
- source: /google/cloud/gsuiteaddons/v1/cloud.google.com/go
765755
dest: /
766-
- source: /google/iam/v1/cloud.google.com/go
767-
dest: /
768-
- source: /google/iam/v2/cloud.google.com/go
769-
dest: /
770-
- source: /google/iam/v3/cloud.google.com/go
771-
dest: /
772-
- source: /google/iam/v3beta/cloud.google.com/go
773-
dest: /
774-
- source: /google/iam/credentials/v1/cloud.google.com/go
775-
dest: /
776756
- source: /google/cloud/iap/v1/cloud.google.com/go
777757
dest: /
778758
- source: /google/cloud/identitytoolkit/v2/cloud.google.com/go

‎.librarian/state.yaml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,83 @@ libraries:
10471047
release_exclude_paths:
10481048
- internal/generated/snippets/eventarc/
10491049
tag_format: '{id}/v{version}'
1050+
- id: iam
1051+
version: 1.5.3
1052+
last_generated_commit: 6821943108fe3284f483defc9b60774a3752de2b
1053+
apis:
1054+
- path: google/iam/credentials/v1
1055+
service_config: iamcredentials_v1.yaml
1056+
- path: google/iam/v1
1057+
service_config: iam_meta_api.yaml
1058+
- path: google/iam/v2
1059+
service_config: iam_v2.yaml
1060+
- path: google/iam/v3
1061+
service_config: iam_v3.yaml
1062+
- path: google/iam/v3beta
1063+
service_config: iam_v3beta.yaml
1064+
source_roots:
1065+
- iam
1066+
- internal/generated/snippets/iam
1067+
preserve_regex: []
1068+
remove_regex:
1069+
- ^internal/generated/snippets/iam/
1070+
- ^iam/admin/apiv1/[^/]*_client\.go$
1071+
- ^iam/admin/apiv1/[^/]*_client_example_go123_test\.go$
1072+
- ^iam/admin/apiv1/[^/]*_client_example_test\.go$
1073+
- ^iam/admin/apiv1/auxiliary\.go$
1074+
- ^iam/admin/apiv1/auxiliary_go123\.go$
1075+
- ^iam/admin/apiv1/doc\.go$
1076+
- ^iam/admin/apiv1/gapic_metadata\.json$
1077+
- ^iam/admin/apiv1/helpers\.go$
1078+
- ^iam/admin/apiv1/adminpb/.*$
1079+
- ^iam/apiv1/[^/]*_client\.go$
1080+
- ^iam/apiv1/[^/]*_client_example_go123_test\.go$
1081+
- ^iam/apiv1/[^/]*_client_example_test\.go$
1082+
- ^iam/apiv1/auxiliary\.go$
1083+
- ^iam/apiv1/auxiliary_go123\.go$
1084+
- ^iam/apiv1/doc\.go$
1085+
- ^iam/apiv1/gapic_metadata\.json$
1086+
- ^iam/apiv1/helpers\.go$
1087+
- ^iam/apiv1/iampb/.*$
1088+
- ^iam/apiv2/[^/]*_client\.go$
1089+
- ^iam/apiv2/[^/]*_client_example_go123_test\.go$
1090+
- ^iam/apiv2/[^/]*_client_example_test\.go$
1091+
- ^iam/apiv2/auxiliary\.go$
1092+
- ^iam/apiv2/auxiliary_go123\.go$
1093+
- ^iam/apiv2/doc\.go$
1094+
- ^iam/apiv2/gapic_metadata\.json$
1095+
- ^iam/apiv2/helpers\.go$
1096+
- ^iam/apiv2/iampb/.*$
1097+
- ^iam/apiv3/[^/]*_client\.go$
1098+
- ^iam/apiv3/[^/]*_client_example_go123_test\.go$
1099+
- ^iam/apiv3/[^/]*_client_example_test\.go$
1100+
- ^iam/apiv3/auxiliary\.go$
1101+
- ^iam/apiv3/auxiliary_go123\.go$
1102+
- ^iam/apiv3/doc\.go$
1103+
- ^iam/apiv3/gapic_metadata\.json$
1104+
- ^iam/apiv3/helpers\.go$
1105+
- ^iam/apiv3/iampb/.*$
1106+
- ^iam/apiv3beta/[^/]*_client\.go$
1107+
- ^iam/apiv3beta/[^/]*_client_example_go123_test\.go$
1108+
- ^iam/apiv3beta/[^/]*_client_example_test\.go$
1109+
- ^iam/apiv3beta/auxiliary\.go$
1110+
- ^iam/apiv3beta/auxiliary_go123\.go$
1111+
- ^iam/apiv3beta/doc\.go$
1112+
- ^iam/apiv3beta/gapic_metadata\.json$
1113+
- ^iam/apiv3beta/helpers\.go$
1114+
- ^iam/apiv3beta/iampb/.*$
1115+
- ^iam/credentials/apiv1/[^/]*_client\.go$
1116+
- ^iam/credentials/apiv1/[^/]*_client_example_go123_test\.go$
1117+
- ^iam/credentials/apiv1/[^/]*_client_example_test\.go$
1118+
- ^iam/credentials/apiv1/auxiliary\.go$
1119+
- ^iam/credentials/apiv1/auxiliary_go123\.go$
1120+
- ^iam/credentials/apiv1/doc\.go$
1121+
- ^iam/credentials/apiv1/gapic_metadata\.json$
1122+
- ^iam/credentials/apiv1/helpers\.go$
1123+
- ^iam/credentials/apiv1/credentialspb/.*$
1124+
release_exclude_paths:
1125+
- internal/generated/snippets/iam/
1126+
tag_format: '{id}/v{version}'
10501127
- id: longrunning
10511128
version: 0.6.7
10521129
last_generated_commit: 7b2b58ff4fb3eee3c0923af35fdee90134fabe3b

‎.release-please-manifest-submodules.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"gkemulticloud": "1.5.4",
4545
"grafeas": "0.3.16",
4646
"gsuiteaddons": "1.7.8",
47-
"iam": "1.5.3",
4847
"iap": "1.11.3",
4948
"identitytoolkit": "0.2.6",
5049
"ids": "1.5.7",

‎internal/stategen/cleanup.go‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,27 @@ func cleanupOwlBotYaml(repoRoot, moduleName string) error {
246246
return fmt.Errorf("loading postprocessor config: %w", err)
247247
}
248248
importPrefix := "cloud.google.com/go/" + moduleName + "/"
249-
modulePathFragment := "/" + moduleName + "/"
249+
// These are designed to match lines conservatively against the root
250+
// of the repo and the root of the generated snippets. For example,
251+
// when removing deep-remove-regex entries for the module "iam"
252+
// want to remove all of:
253+
//
254+
// - /iam/apiv1/
255+
// - /iam/apiv2/
256+
// - /iam/apiv3/
257+
// - /iam/apiv3beta/
258+
// - /iam/credentials/apiv1/
259+
// - /internal/generated/snippets/iam/apiv1/
260+
// - /internal/generated/snippets/iam/apiv2/
261+
// - /internal/generated/snippets/iam/apiv3/
262+
// - /internal/generated/snippets/iam/apiv3beta/
263+
// - /internal/generated/snippets/iam/credentials/apiv1
264+
//
265+
// ... but we *don't* want to remove:
266+
// - /policytroubleshooter/iam/apiv3/
267+
// - /internal/generated/snippets/policytroubleshooter/iam/apiv3/
268+
modulePathFragment := " /" + moduleName + "/"
269+
snippetsPathFragment := "/snippets/" + moduleName + "/"
250270

251271
lines := strings.Split(string(fileBytes), "\n")
252272
var newLines []string
@@ -269,8 +289,8 @@ func cleanupOwlBotYaml(repoRoot, moduleName string) error {
269289
}
270290
}
271291

272-
if strings.Contains(line, modulePathFragment) {
273-
// Remove any non-source line containing the module name.
292+
if strings.Contains(line, modulePathFragment) || strings.Contains(line, snippetsPathFragment) {
293+
// Remove any non-source line containing the module path or snippets path.
274294
continue
275295
}
276296
newLines = append(newLines, line)

‎release-please-config-yoshi-submodules.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,6 @@
138138
"gsuiteaddons": {
139139
"component": "gsuiteaddons"
140140
},
141-
"iam": {
142-
"component": "iam"
143-
},
144141
"iap": {
145142
"component": "iap"
146143
},

0 commit comments

Comments
 (0)