Skip to content

Commit a8d2c07

Browse files
committed
fix: some more api adjustments
1 parent 72516e0 commit a8d2c07

3 files changed

Lines changed: 32 additions & 19 deletions

File tree

src/commands/fleet/configs.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
Mount,
99
PortDefinition,
1010
Protocol,
11-
PublishMode,
1211
RestartPolicy,
1312
RestartPolicyCondition,
1413
ServerConfig,
@@ -257,7 +256,6 @@ const createConfig = new Command()
257256
ports.push({
258257
name: portDefinition.name!,
259258
targetPort: portDefinition.targetPort!,
260-
publishMode: PublishMode.Ingress, // We default to Ingress for now
261259
protocols: [portDefinition.protocol] as Protocol[],
262260
});
263261
}

src/commands/fleet/deployments.ts

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { filterArray } from "../../filter.ts";
1616
import {
1717
confirm,
1818
ensureApiException,
19+
getAllPaginated,
1920
inform,
2021
logError,
2122
logErrorAndExit,
@@ -35,7 +36,9 @@ const deploymentsList = new Command()
3536
const app = await getSelectedAppOrExit(options);
3637
let deployments: AppLocationSetting[] = [];
3738
try {
38-
deployments = await apiClient.getAppLocationSettings(app.id);
39+
deployments = await getAllPaginated((page) =>
40+
apiClient.getAppLocationSettings(app.id, 50, page)
41+
);
3942
} catch (error) {
4043
ensureApiException(error);
4144
logErrorAndExit(
@@ -76,7 +79,9 @@ export const getDeploymentDetails = new Command()
7679
if (!deploymentId) {
7780
let deployments: AppLocationSetting[] = [];
7881
try {
79-
deployments = await apiClient.getAppLocationSettings(app.id);
82+
deployments = await getAllPaginated((page) =>
83+
apiClient.getAppLocationSettings(app.id, 50, page)
84+
);
8085
} catch (error) {
8186
ensureApiException(error);
8287
logErrorAndExit(
@@ -154,7 +159,9 @@ export const createDeployment = new Command()
154159
// Select Location
155160
let locations: Location[] = [];
156161
try {
157-
locations = await apiClient.getLocations();
162+
locations = await getAllPaginated((page) =>
163+
apiClient.getLocations(50, page)
164+
);
158165
} catch (error) {
159166
ensureApiException(error);
160167
logErrorAndExit(
@@ -186,7 +193,9 @@ export const createDeployment = new Command()
186193

187194
let configs: ServerConfig[] = [];
188195
try {
189-
configs = await apiClient.getServerConfigs(app.id);
196+
configs = await getAllPaginated((page) =>
197+
apiClient.getServerConfigs(app.id, 50, page)
198+
);
190199
} catch (error) {
191200
ensureApiException(error);
192201
logErrorAndExit(
@@ -234,7 +243,9 @@ export const createDeployment = new Command()
234243
// Try to find the correct location using the specified options (--city, --country and --password)
235244
let locations: Location[] = [];
236245
try {
237-
locations = await apiClient.getLocations();
246+
locations = await getAllPaginated((page) =>
247+
apiClient.getLocations(50, page)
248+
);
238249
} catch (error) {
239250
ensureApiException(error);
240251
logErrorAndExit(
@@ -337,7 +348,9 @@ const updateDeployment = new Command()
337348
let deploymentId = options.deploymentId;
338349
let deployments: AppLocationSetting[] = [];
339350
try {
340-
deployments = await apiClient.getAppLocationSettings(selectedApp.id);
351+
deployments = await getAllPaginated((page) =>
352+
apiClient.getAppLocationSettings(selectedApp.id, 50, page)
353+
);
341354
} catch (error) {
342355
ensureApiException(error);
343356
logErrorAndExit(
@@ -416,7 +429,9 @@ const deleteDeployment = new Command()
416429
let deploymentId = options.deploymentId;
417430
let deployments: AppLocationSetting[] = [];
418431
try {
419-
deployments = await apiClient.getAppLocationSettings(selectedApp.id);
432+
deployments = await getAllPaginated((page) =>
433+
apiClient.getAppLocationSettings(selectedApp.id, 50, page)
434+
);
420435
} catch (error) {
421436
ensureApiException(error);
422437
logErrorAndExit(

src/commands/fleet/servers.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const serverAddress = new Command()
8686
return {
8787
name: `${server.id} - ${
8888
server.location!.city
89-
} - ${server.serverConfigName} - ${server.node.address}`,
89+
} - ${server.serverConfigName} - ${server.node?.address}`,
9090
value: server.id,
9191
};
9292
}),
@@ -104,7 +104,7 @@ const serverAddress = new Command()
104104
Object.entries(server.ports!).forEach(([portName, port]) => {
105105
table.push([
106106
server.id,
107-
`${server.node.address}:${port.publishedPort}`,
107+
`${server.node?.address}:${port.publishedPort}`,
108108
portName,
109109
]);
110110
});
@@ -145,7 +145,7 @@ const showServerInfo = new Command()
145145
return {
146146
name: `${server.id} - ${
147147
server.location!.city
148-
} - ${server.serverConfigName} - ${server.node.address}`,
148+
} - ${server.serverConfigName} - ${server.node?.address}`,
149149
value: server.id,
150150
};
151151
}),
@@ -225,7 +225,7 @@ const showServerLogs = new Command()
225225
return {
226226
name: `${server.id} - ${
227227
server.location!.city
228-
} - ${server.serverConfigName} - ${server.node.address}`,
228+
} - ${server.serverConfigName} - ${server.node?.address}`,
229229
value: server.id,
230230
};
231231
}),
@@ -290,7 +290,7 @@ const createBackup = new Command()
290290
return {
291291
name: `${server.id} - ${
292292
server.location!.city
293-
} - ${server.serverConfigName} - ${server.node.address}`,
293+
} - ${server.serverConfigName} - ${server.node?.address}`,
294294
value: server.id,
295295
};
296296
}),
@@ -382,7 +382,7 @@ const getBackupDownloadUrl = new Command()
382382
return {
383383
name: `${server.id} - ${
384384
server.location!.city
385-
} - ${server.serverConfigName} - ${server.node.address}`,
385+
} - ${server.serverConfigName} - ${server.node?.address}`,
386386
value: server.id,
387387
};
388388
}),
@@ -447,7 +447,7 @@ export const restoreBackup = new Command()
447447
return {
448448
name: `${server.id} - ${
449449
server.location!.city
450-
} - ${server.serverConfigName} - ${server.node.address}`,
450+
} - ${server.serverConfigName} - ${server.node?.address}`,
451451
value: server.id,
452452
};
453453
}),
@@ -519,7 +519,7 @@ const restartServer = new Command()
519519
return {
520520
name: `${server.id} - ${
521521
server.location!.city
522-
} - ${server.serverConfigName} - ${server.node.address}`,
522+
} - ${server.serverConfigName} - ${server.node?.address}`,
523523
value: server.id,
524524
};
525525
}),
@@ -592,7 +592,7 @@ const getMetadata = new Command()
592592
return {
593593
name: `${server.id} - ${
594594
server.location!.city
595-
} - ${server.serverConfigName} - ${server.node.address}`,
595+
} - ${server.serverConfigName} - ${server.node?.address}`,
596596
value: server.id,
597597
};
598598
}),
@@ -656,7 +656,7 @@ const setMetadata = new Command()
656656
return {
657657
name: `${server.id} - ${
658658
server.location!.city
659-
} - ${server.serverConfigName} - ${server.node.address}`,
659+
} - ${server.serverConfigName} - ${server.node?.address}`,
660660
value: server.id,
661661
};
662662
}),

0 commit comments

Comments
 (0)