Skip to content

Add support for specifying regionsVersion in subscription create/update commands #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
softlion wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for specifying regionsVersion in subscription create/update commands #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"scripts": {
"prebuild": "tsx ../../scripts/build-docs-bundle.ts",
"build": "tsup",
"postbuild": "mkdir -p dist/generated && cp src/generated/docs-bundle.json dist/generated/",
"postbuild": "node -e \"const fs=require('node:fs');fs.mkdirSync('dist/generated',{recursive:true});fs.copyFileSync('src/generated/docs-bundle.json','dist/generated/docs-bundle.json')\"",
"dev": "tsup --watch",
"test": "vitest run",
"test:watch": "vitest",
Expand Down
21 changes: 18 additions & 3 deletions packages/cli/src/commands/subscriptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ export function registerSubscriptionsCommands(program: Command): void {
.description("Create a subscription from JSON file")
.requiredOption("--file <path>", "JSON file with subscription data")
.option("--activate", "Activate all base plans after creation")
.option("--regions-version <version>", "Regional pricing version (default 2022/02)")
.action(async (options) => {
const config = await loadConfig();
const packageName = resolvePackageName(program.opts()["app"], config);
Expand All @@ -150,7 +151,10 @@ export function registerSubscriptionsCommands(program: Command): void {
command: "subscriptions create",
action: "create",
target: `subscription from ${options.file}`,
details: options.activate ? { activate: true } : undefined,
details: {
...(options.activate ? { activate: true } : {}),
...(options.regionsVersion ? { regionsVersion: options.regionsVersion } : {}),
},
},
format,
formatOutput,
Expand All @@ -161,7 +165,12 @@ export function registerSubscriptionsCommands(program: Command): void {
const client = await getClient(config);

const data = await readJsonFile(options.file);
const result = await createSubscription(client, packageName, data as Subscription);
const result = await createSubscription(
client,
packageName,
data as Subscription,
options.regionsVersion,
);

if (options.activate && result.basePlans) {
for (const bp of result.basePlans) {
Expand All @@ -183,6 +192,7 @@ export function registerSubscriptionsCommands(program: Command): void {
.description("Update a subscription from JSON file")
.requiredOption("--file <path>", "JSON file with subscription data")
.option("--update-mask <fields>", "Comma-separated field mask")
.option("--regions-version <version>", "Regional pricing version (default 2022/02)")
.action(async (productId: string, options) => {
const config = await loadConfig();
const packageName = resolvePackageName(program.opts()["app"], config);
Expand All @@ -194,7 +204,11 @@ export function registerSubscriptionsCommands(program: Command): void {
command: "subscriptions update",
action: "update",
target: productId,
details: { file: options.file, updateMask: options.updateMask },
details: {
file: options.file,
updateMask: options.updateMask,
regionsVersion: options.regionsVersion,
},
},
format,
formatOutput,
Expand All @@ -211,6 +225,7 @@ export function registerSubscriptionsCommands(program: Command): void {
productId,
data as Subscription,
options.updateMask,
options.regionsVersion,
);
console.log(formatOutput(result, format));
});
Expand Down
6 changes: 4 additions & 2 deletions packages/core/src/commands/subscriptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,12 @@ export async function createSubscription(
client: PlayApiClient,
packageName: string,
data: Subscription,
regionsVersion?: string,
): Promise<Subscription> {
validatePackageName(packageName);
validateSubscriptionData(data);
const sanitized = sanitizeSubscription(data);
return client.subscriptions.create(packageName, sanitized, data.productId);
return client.subscriptions.create(packageName, sanitized, data.productId, regionsVersion);
}

const SUBSCRIPTION_ID_FIELDS = new Set(["productId", "packageName"]);
Expand All @@ -199,13 +200,14 @@ export async function updateSubscription(
productId: string,
data: Subscription,
updateMask?: string,
regionsVersion?: string,
): Promise<Subscription> {
validatePackageName(packageName);
validateSku(productId);
validateSubscriptionData(data);
const sanitized = sanitizeSubscription(data);
const mask = updateMask || deriveSubscriptionUpdateMask(data);
return client.subscriptions.update(packageName, productId, sanitized, mask);
return client.subscriptions.update(packageName, productId, sanitized, mask, regionsVersion);
}

export async function deleteSubscription(
Expand Down