Skip to content

Commit 62ec742

Browse files
authored
fix(internal/librarian/dart): remove key prefix when building sidekick config (#3787)
Remove `prefix:` and `proto:` when building sidekick config. These prefix is already there in `.sidekick.toml`. For #3580
1 parent 93f01aa commit 62ec742

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

internal/librarian/dart/generate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ func buildCodec(library *config.Library) map[string]string {
128128
codec[key] = value
129129
}
130130
for key, value := range dart.Prefixes {
131-
codec["prefix:"+key] = value
131+
codec[key] = value
132132
}
133133
for key, value := range dart.Protos {
134-
codec["proto:"+key] = value
134+
codec[key] = value
135135
}
136136
return codec
137137
}

internal/librarian/dart/generate_test.go

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ func TestBuildCodec(t *testing.T) {
254254
library: &config.Library{
255255
Dart: &config.DartPackage{
256256
Prefixes: map[string]string{
257-
"google.protobuf": "pb",
258-
"google.api": "api",
257+
"prefix:google.protobuf": "pb",
258+
"prefix:google.api": "api",
259259
},
260260
},
261261
},
@@ -269,8 +269,8 @@ func TestBuildCodec(t *testing.T) {
269269
library: &config.Library{
270270
Dart: &config.DartPackage{
271271
Protos: map[string]string{
272-
"google.api": "package:google_cloud_api/api.dart",
273-
"google.protobuf": "package:protobuf/protobuf.dart",
272+
"proto:google.api": "package:google_cloud_api/api.dart",
273+
"proto:google.protobuf": "package:protobuf/protobuf.dart",
274274
},
275275
},
276276
},
@@ -300,10 +300,10 @@ func TestBuildCodec(t *testing.T) {
300300
"package:googleapis_auth": "^2.0.0",
301301
},
302302
Prefixes: map[string]string{
303-
"google.protobuf": "pb",
303+
"prefix:google.protobuf": "pb",
304304
},
305305
Protos: map[string]string{
306-
"google.api": "package:google_cloud_api/api.dart",
306+
"proto:google.api": "package:google_cloud_api/api.dart",
307307
},
308308
},
309309
},
@@ -460,20 +460,20 @@ func TestToSidekickConfig(t *testing.T) {
460460
"googleapis-root": googleapisDir,
461461
},
462462
Codec: map[string]string{
463-
"api-keys-environment-variables": "GOOGLE_API_KEY",
464-
"dependencies": "dep-1,dep-2",
465-
"dev-dependencies": "dev-dep-1,dev-dep-2",
466-
"extra-imports": "extra-imports",
467-
"issue-tracker-url": "https://tracker/issues",
468-
"library-path-override": "library-path-override",
469-
"not-for-publication": "false",
470-
"package:googleapis_auth": "^2.0.0",
471-
"part-file": "part-file",
472-
"prefix:prefix:google.logging.type": "logging_type",
473-
"proto:proto:google.api": "package:google_cloud_api/api.dart",
474-
"readme-after-title-text": "readme-after-title-text",
475-
"readme-quickstart-text": "readme-quickstart-text",
476-
"repository-url": "https://github.com/googleapis/google-cloud-dart",
463+
"api-keys-environment-variables": "GOOGLE_API_KEY",
464+
"dependencies": "dep-1,dep-2",
465+
"dev-dependencies": "dev-dep-1,dev-dep-2",
466+
"extra-imports": "extra-imports",
467+
"issue-tracker-url": "https://tracker/issues",
468+
"library-path-override": "library-path-override",
469+
"not-for-publication": "false",
470+
"package:googleapis_auth": "^2.0.0",
471+
"part-file": "part-file",
472+
"prefix:google.logging.type": "logging_type",
473+
"proto:google.api": "package:google_cloud_api/api.dart",
474+
"readme-after-title-text": "readme-after-title-text",
475+
"readme-quickstart-text": "readme-quickstart-text",
476+
"repository-url": "https://github.com/googleapis/google-cloud-dart",
477477
},
478478
},
479479
},

0 commit comments

Comments
 (0)