wrangler 2.0.18 → 2.0.22

package/src/pubsub/pubsub-commands.tsx

@@ -3,6 +3,7 @@ import { readConfig } from "../config";
 import { confirm } from "../dialogs";
 import { CommandLineArgsError } from "../index";
 import { logger } from "../logger";
+import * as metrics from "../metrics";
 import { parseHumanDuration } from "../parse";
 import { requireAuth } from "../user";
 import * as pubsub from ".";
@@ -50,6 +51,9 @@ export function pubSubCommands(
 							logger.log(`Creating Pub/SubNamespace ${args.name}...`);
 							await pubsub.createPubSubNamespace(accountId, namespace);
 							logger.log(`Success! Created Pub/Sub Namespace ${args.name}`);
+							await metrics.sendMetricsEvent("create pubsub namespace", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					)
 					.command(
@@ -63,6 +67,9 @@ export function pubSubCommands(
 							const accountId = await requireAuth(config);
 
 							logger.log(await pubsub.listPubSubNamespaces(accountId));
+							await metrics.sendMetricsEvent("list pubsub namespaces", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					)
 					.command(
@@ -89,6 +96,9 @@ export function pubSubCommands(
 								logger.log(`Deleting namespace ${args.name}...`);
 								await pubsub.deletePubSubNamespace(accountId, args.name);
 								logger.log(`Deleted namespace ${args.name}.`);
+								await metrics.sendMetricsEvent("delete pubsub namespace", {
+									sendMetrics: config.send_metrics,
+								});
 							}
 						}
 					)
@@ -111,6 +121,9 @@ export function pubSubCommands(
 							logger.log(
 								await pubsub.describePubSubNamespace(accountId, args.name)
 							);
+							await metrics.sendMetricsEvent("view pubsub namespace", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					)
 					.epilogue(pubsub.pubSubBetaWarning);
@@ -178,6 +191,9 @@ export function pubSubCommands(
 					logger.log(
 						await pubsub.createPubSubBroker(accountId, args.namespace, broker)
 					);
+					await metrics.sendMetricsEvent("create pubsub broker", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -247,6 +263,9 @@ export function pubSubCommands(
 						)
 					);
 					logger.log(`Successfully updated Pub/Sub Broker ${args.name}`);
+					await metrics.sendMetricsEvent("update pubsub broker", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -268,6 +287,9 @@ export function pubSubCommands(
 					const accountId = await requireAuth(config);
 
 					logger.log(await pubsub.listPubSubBrokers(accountId, args.namespace));
+					await metrics.sendMetricsEvent("list pubsub brokers", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -306,6 +328,9 @@ export function pubSubCommands(
 								args.name
 							);
 							logger.log(`Deleted Pub/Sub Broker ${args.name}.`);
+							await metrics.sendMetricsEvent("delete pubsub broker", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					}
 				)
@@ -338,6 +363,9 @@ export function pubSubCommands(
 								args.name
 							)
 						);
+						await metrics.sendMetricsEvent("view pubsub broker", {
+							sendMetrics: config.send_metrics,
+						});
 					}
 				);
 
@@ -413,6 +441,9 @@ export function pubSubCommands(
 							parsedExpiration
 						)
 					);
+					await metrics.sendMetricsEvent("issue pubsub broker credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -458,6 +489,9 @@ export function pubSubCommands(
 					);
 
 					logger.log(`Revoked ${args.jti.length} credential(s).`);
+					await metrics.sendMetricsEvent("revoke pubsub broker credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -502,6 +536,9 @@ export function pubSubCommands(
 					);
 
 					logger.log(`Unrevoked ${numTokens} credential(s)`);
+					await metrics.sendMetricsEvent("unrevoke pubsub broker credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -535,6 +572,12 @@ export function pubSubCommands(
 							args.name
 						)
 					);
+					await metrics.sendMetricsEvent(
+						"list pubsub broker revoked credentials",
+						{
+							sendMetrics: config.send_metrics,
+						}
+					);
 				}
 			);
 
@@ -567,6 +610,9 @@ export function pubSubCommands(
 							args.name
 						)
 					);
+					await metrics.sendMetricsEvent("list pubsub broker public-keys", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 

package/src/user/user.tsx

@@ -1058,7 +1058,8 @@ export function listScopes(message = "💁 Available scopes:"): void {
 		Scope: scope,
 		Description: Scopes[scope],
 	}));
-	render(<Table data={data} />);
+	const { unmount } = render(<Table data={data} />);
+	unmount();
 	// TODO: maybe a good idea to show usage here
 }
 

package/src/whoami.tsx

@@ -8,7 +8,8 @@ import { getAPIToken, getAuthFromEnv } from "./user";
 export async function whoami() {
 	logger.log("Getting User settings...");
 	const user = await getUserInfo();
-	render(<WhoAmI user={user}></WhoAmI>);
+	const { unmount } = render(<WhoAmI user={user}></WhoAmI>);
+	unmount();
 }
 
 export function WhoAmI({ user }: { user: UserInfo | undefined }) {

package/src/worker-namespace.ts

@@ -1,6 +1,7 @@
 import { fetchResult } from "./cfetch";
 import { readConfig } from "./config";
 import { logger } from "./logger";
+import * as metrics from "./metrics";
 import { requireAuth } from "./user";
 import { printWranglerBanner } from ".";
 import type { ConfigPath } from ".";
@@ -113,6 +114,9 @@ export function workerNamespaceCommands(
 			const config = readConfig(args.config as ConfigPath, args);
 			const accountId = await requireAuth(config);
 			await listWorkerNamespaces(accountId);
+			await metrics.sendMetricsEvent("list worker namespaces", {
+				sendMetrics: config.send_metrics,
+			});
 		})
 		.command(
 			"get <name>",
@@ -128,6 +132,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await getWorkerNamespaceInfo(accountId, args.name);
+				await metrics.sendMetricsEvent("view worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		)
 		.command(
@@ -145,6 +152,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await createWorkerNamespace(accountId, args.name);
+				await metrics.sendMetricsEvent("create worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		)
 		.command(
@@ -162,6 +172,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await deleteWorkerNamespace(accountId, args.name);
+				await metrics.sendMetricsEvent("delete worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		)
 		.command(
@@ -185,6 +198,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await renameWorkerNamespace(accountId, args.oldName, args.newName);
+				await metrics.sendMetricsEvent("rename worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		);
 }