Skip to content

Commit c90de99

Browse files
authored
fix(internal/librarian): fill APIKeysEnvironmentVariables from Dart defaults (#3802)
Fill `APIKeysEnvironmentVariables` from Dart defaults if the library doesn't have one. For #3580
1 parent d0d1ed7 commit c90de99

2 files changed

Lines changed: 19 additions & 11 deletions

File tree

internal/librarian/library.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ func fillDart(lib *config.Library, d *config.Default) *config.Library {
8080
if lib.Dart == nil {
8181
lib.Dart = &config.DartPackage{}
8282
}
83+
if lib.Dart.APIKeysEnvironmentVariables == "" {
84+
lib.Dart.APIKeysEnvironmentVariables = d.Dart.APIKeysEnvironmentVariables
85+
}
8386
if lib.Dart.IssueTrackerURL == "" {
8487
lib.Dart.IssueTrackerURL = d.Dart.IssueTrackerURL
8588
}

internal/librarian/library_test.go

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ func TestFillDefaults(t *testing.T) {
7777
name: "dart defaults",
7878
defaults: &config.Default{
7979
Dart: &config.DartPackage{
80-
Dependencies: "dep-1,dep-2",
81-
IssueTrackerURL: "https://issue-tracker-example/dart",
80+
APIKeysEnvironmentVariables: "apiKey-1,apiKey-2",
81+
Dependencies: "dep-1,dep-2",
82+
IssueTrackerURL: "https://issue-tracker-example/dart",
8283
Packages: map[string]string{
8384
"package:one": "^1.2.3",
8485
"package:two": "^2.0.0",
@@ -91,18 +92,20 @@ func TestFillDefaults(t *testing.T) {
9192
Output: "foo/",
9293
Version: "0.4.0",
9394
Dart: &config.DartPackage{
94-
Dependencies: "dep-1,dep-2",
95-
IssueTrackerURL: "https://issue-tracker-example/dart",
96-
Packages: map[string]string{"package:one": "^1.2.3", "package:two": "^2.0.0"},
95+
APIKeysEnvironmentVariables: "apiKey-1,apiKey-2",
96+
Dependencies: "dep-1,dep-2",
97+
IssueTrackerURL: "https://issue-tracker-example/dart",
98+
Packages: map[string]string{"package:one": "^1.2.3", "package:two": "^2.0.0"},
9799
},
98100
},
99101
},
100102
{
101103
name: "dart defaults do not override library params",
102104
defaults: &config.Default{
103105
Dart: &config.DartPackage{
104-
Dependencies: "dep-1,dep-2",
105-
IssueTrackerURL: "https://issue-tracker-example/dart",
106+
APIKeysEnvironmentVariables: "apiKey-1,apiKey-2",
107+
Dependencies: "dep-1,dep-2",
108+
IssueTrackerURL: "https://issue-tracker-example/dart",
106109
Packages: map[string]string{
107110
"package:one": "^1.2.3",
108111
"package:two": "^2.0.0",
@@ -114,8 +117,9 @@ func TestFillDefaults(t *testing.T) {
114117
Output: "foo/",
115118
Version: "0.5.0",
116119
Dart: &config.DartPackage{
117-
Dependencies: "dep-3,dep-4",
118-
IssueTrackerURL: "https://another-issue-tracker-example/dart",
120+
APIKeysEnvironmentVariables: "apiKey-3,apiKey-4",
121+
Dependencies: "dep-3,dep-4",
122+
IssueTrackerURL: "https://another-issue-tracker-example/dart",
119123
Packages: map[string]string{
120124
"package:three": "^1.0.0",
121125
},
@@ -125,8 +129,9 @@ func TestFillDefaults(t *testing.T) {
125129
Output: "foo/",
126130
Version: "0.5.0",
127131
Dart: &config.DartPackage{
128-
Dependencies: "dep-3,dep-4",
129-
IssueTrackerURL: "https://another-issue-tracker-example/dart",
132+
APIKeysEnvironmentVariables: "apiKey-3,apiKey-4",
133+
Dependencies: "dep-3,dep-4",
134+
IssueTrackerURL: "https://another-issue-tracker-example/dart",
130135
Packages: map[string]string{
131136
"package:three": "^1.0.0",
132137
},

0 commit comments

Comments
 (0)