Skip to content

Commit 50cee21

Browse files
committed
Fix integration tests
1 parent 2cadfba commit 50cee21

File tree

1 file changed

+24
-11
lines changed

1 file changed

+24
-11
lines changed

FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,29 @@ import Testing
2121

2222
struct InstanceConfig: Equatable, Encodable {
2323
static let vertexAI_v1beta = InstanceConfig(
24-
apiConfig: APIConfig(service: .vertexAI(endpoint: .firebaseProxyProd), version: .v1beta)
24+
apiConfig: APIConfig(
25+
service: .vertexAI(endpoint: .firebaseProxyProd, location: "us-central1"),
26+
version: .v1beta
27+
)
2528
)
2629
static let vertexAI_v1beta_global = InstanceConfig(
27-
location: "global",
28-
apiConfig: APIConfig(service: .vertexAI(endpoint: .firebaseProxyProd), version: .v1beta)
30+
apiConfig: APIConfig(
31+
service: .vertexAI(endpoint: .firebaseProxyProd, location: "global"),
32+
version: .v1beta
33+
)
2934
)
3035
static let vertexAI_v1beta_global_appCheckLimitedUse = InstanceConfig(
31-
location: "global",
3236
useLimitedUseAppCheckTokens: true,
33-
apiConfig: APIConfig(service: .vertexAI(endpoint: .firebaseProxyProd), version: .v1beta)
37+
apiConfig: APIConfig(
38+
service: .vertexAI(endpoint: .firebaseProxyProd, location: "global"),
39+
version: .v1beta
40+
)
3441
)
3542
static let vertexAI_v1beta_staging = InstanceConfig(
36-
apiConfig: APIConfig(service: .vertexAI(endpoint: .firebaseProxyStaging), version: .v1beta)
43+
apiConfig: APIConfig(
44+
service: .vertexAI(endpoint: .firebaseProxyStaging, location: "us-central1"),
45+
version: .v1beta
46+
)
3747
)
3848
static let googleAI_v1beta = InstanceConfig(
3949
apiConfig: APIConfig(service: .googleAI(endpoint: .firebaseProxyProd), version: .v1beta)
@@ -68,12 +78,18 @@ struct InstanceConfig: Equatable, Encodable {
6878

6979
static let vertexAI_v1beta_appCheckNotConfigured = InstanceConfig(
7080
appName: FirebaseAppNames.appCheckNotConfigured,
71-
apiConfig: APIConfig(service: .vertexAI(endpoint: .firebaseProxyProd), version: .v1beta)
81+
apiConfig: APIConfig(
82+
service: .vertexAI(endpoint: .firebaseProxyProd, location: "us-central1"),
83+
version: .v1beta
84+
)
7285
)
7386
static let vertexAI_v1beta_appCheckNotConfigured_limitedUseTokens = InstanceConfig(
7487
appName: FirebaseAppNames.appCheckNotConfigured,
7588
useLimitedUseAppCheckTokens: true,
76-
apiConfig: APIConfig(service: .vertexAI(endpoint: .firebaseProxyProd), version: .v1beta)
89+
apiConfig: APIConfig(
90+
service: .vertexAI(endpoint: .firebaseProxyProd, location: "us-central1"),
91+
version: .v1beta
92+
)
7793
)
7894
static let googleAI_v1beta_appCheckNotConfigured = InstanceConfig(
7995
appName: FirebaseAppNames.appCheckNotConfigured,
@@ -150,10 +166,8 @@ extension FirebaseAI {
150166
static func componentInstance(_ instanceConfig: InstanceConfig) -> FirebaseAI {
151167
switch instanceConfig.apiConfig.service {
152168
case .vertexAI:
153-
let location = instanceConfig.location ?? "us-central1"
154169
return FirebaseAI.createInstance(
155170
app: instanceConfig.app,
156-
location: location,
157171
apiConfig: instanceConfig.apiConfig,
158172
useLimitedUseAppCheckTokens: instanceConfig.useLimitedUseAppCheckTokens
159173
)
@@ -164,7 +178,6 @@ extension FirebaseAI {
164178
)
165179
return FirebaseAI.createInstance(
166180
app: instanceConfig.app,
167-
location: nil,
168181
apiConfig: instanceConfig.apiConfig,
169182
useLimitedUseAppCheckTokens: instanceConfig.useLimitedUseAppCheckTokens
170183
)

0 commit comments

Comments
 (0)