Skip to content

feat: update the limits of plugins #2153

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

Merged
JivusAyrus merged 3 commits into from
Aug 19, 2025
Merged

feat: update the limits of plugins #2153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
313915c
feat: update the limits of plugins
JivusAyrus Aug 19, 2025
a6cc5a6
fix: tests
JivusAyrus Aug 19, 2025
5112f6d
Merge branch 'main' into suvij/update-billing-for-plugins
JivusAyrus Aug 19, 2025
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
15 changes: 10 additions & 5 deletions controlplane/src/bin/billing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
{
"id": "field-pruning-grace-period",
"limit": 0
},
{
"id": "plugins",
"description": "3 Plugins",
"limit": 3
}
]
},
Expand Down Expand Up @@ -72,8 +77,8 @@
},
{
"id": "plugins",
"description": "3 Plugins",
"limit": 3
"description": "10 Plugins",
"limit": 10
}
]
},
Expand Down Expand Up @@ -124,8 +129,8 @@
},
{
"id": "plugins",
"description": "15 Plugins",
"limit": 15
"description": "20 Plugins",
"limit": 20
}
]
},
Expand Down Expand Up @@ -173,7 +178,7 @@
{
"id": "plugins",
"description": "Unlimited Plugins",
"limit": 20
"limit": 30
}
Comment thread
JivusAyrus marked this conversation as resolved.
Comment thread
JivusAyrus marked this conversation as resolved.
]
}
Expand Down
2 changes: 1 addition & 1 deletion controlplane/test/feature-subgraph/create-feature-subgraph.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ describe('Create feature subgraph tests', () => {
test('that creating a feature subgraph from a plugin base fails when plugin limit is reached', async () => {
const { client, server } = await SetupTest({
dbname,
setupBilling: { plan: 'launch@1' }, // Launch plan allows max 3 plugins
setupBilling: { plan: 'developer@1' }, // Developer plan allows max 3 plugins
});

const basePluginName = genID('basePlugin');
Expand Down
23 changes: 19 additions & 4 deletions controlplane/test/plugin/validate-and-fetch-plugin-data.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,28 @@ describe('ValidateAndFetchPluginData', () => {
setupBilling: { plan: 'developer@1' }, // Developer plan has 0 plugin limit
});

const pluginName = genID('plugin');
const label = genUniqueLabel('test');
// Create 3 plugins successfully
for (let i = 1; i <= 3; i++) {
const pluginName = genID(`plugin-${i}`);
const pluginLabel = genUniqueLabel(`team-${i}`);

const createPluginSubgraphResp = await client.createFederatedSubgraph({
name: pluginName,
namespace: DEFAULT_NAMESPACE,
type: SubgraphType.GRPC_PLUGIN,
labels: [pluginLabel],
});

expect(createPluginSubgraphResp.response?.code).toBe(EnumStatusCode.OK);
}

const fourthPluginName = genID('plugin-4');
const fourthPluginLabel = genUniqueLabel('team-4');

const response = await client.validateAndFetchPluginData({
name: pluginName,
name: fourthPluginName,
namespace: DEFAULT_NAMESPACE,
labels: [label],
labels: [fourthPluginLabel],
});

expect(response.response?.code).toBe(EnumStatusCode.ERR_LIMIT_REACHED);
Expand Down
55 changes: 35 additions & 20 deletions controlplane/test/subgraph/create-subgraph.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,30 +575,45 @@ describe('Create subgraph tests', () => {
setupBilling: { plan: 'developer@1' },
});

const pluginName = genID('plugin');
const pluginLabel = genUniqueLabel('env');
// Create 3 plugins successfully
for (let i = 1; i <= 3; i++) {
const pluginName = genID(`plugin-${i}`);
const pluginLabel = genUniqueLabel(`team-${i}`);

const createPluginSubgraphResp = await client.createFederatedSubgraph({
name: pluginName,
const createPluginSubgraphResp = await client.createFederatedSubgraph({
name: pluginName,
namespace: DEFAULT_NAMESPACE,
type: SubgraphType.GRPC_PLUGIN,
labels: [pluginLabel],
});

expect(createPluginSubgraphResp.response?.code).toBe(EnumStatusCode.OK);
}

const fourthPluginName = genID('plugin-4');
const fourthPluginLabel = genUniqueLabel('team-4');

const createFourthPluginResponse = await client.createFederatedSubgraph({
name: fourthPluginName,
namespace: DEFAULT_NAMESPACE,
type: SubgraphType.GRPC_PLUGIN,
labels: [pluginLabel],
labels: [fourthPluginLabel],
});

expect(createPluginSubgraphResp.response?.code).toBe(EnumStatusCode.ERR_LIMIT_REACHED);
expect(createPluginSubgraphResp.response?.details).toBe('The organization reached the limit of plugins');
expect(createFourthPluginResponse.response?.code).toBe(EnumStatusCode.ERR_LIMIT_REACHED);
expect(createFourthPluginResponse.response?.details).toBe('The organization reached the limit of plugins');

await server.close();
});

test('Should enforce plugin limit on launch plan (max 3 plugins)', async () => {
test('Should enforce plugin limit on launch plan (max 10 plugins)', async () => {
const { client, server } = await SetupTest({
dbname,
setupBilling: { plan: 'launch@1' },
});

// Create 3 plugins successfully
for (let i = 1; i <= 3; i++) {
// Create 10 plugins successfully
for (let i = 1; i <= 10; i++) {
const pluginName = genID(`plugin-${i}`);
const pluginLabel = genUniqueLabel(`team-${i}`);

Expand All @@ -612,19 +627,19 @@ describe('Create subgraph tests', () => {
expect(createPluginSubgraphResp.response?.code).toBe(EnumStatusCode.OK);
}

// The 4th plugin should fail due to limit
const fourthPluginName = genID('plugin-4');
const fourthPluginLabel = genUniqueLabel('team-4');
// The 11th plugin should fail due to limit
const eleventhPluginName = genID('plugin-11');
const eleventhPluginLabel = genUniqueLabel('team-11');

const createFourthPluginResp = await client.createFederatedSubgraph({
name: fourthPluginName,
const createEleventhPluginResp = await client.createFederatedSubgraph({
name: eleventhPluginName,
namespace: DEFAULT_NAMESPACE,
type: SubgraphType.GRPC_PLUGIN,
labels: [fourthPluginLabel],
labels: [eleventhPluginLabel],
});

expect(createFourthPluginResp.response?.code).toBe(EnumStatusCode.ERR_LIMIT_REACHED);
expect(createFourthPluginResp.response?.details).toBe('The organization reached the limit of plugins');
expect(createEleventhPluginResp.response?.code).toBe(EnumStatusCode.ERR_LIMIT_REACHED);
expect(createEleventhPluginResp.response?.details).toBe('The organization reached the limit of plugins');

await server.close();
});
Expand Down Expand Up @@ -798,8 +813,8 @@ describe('Create subgraph tests', () => {
setupBilling: { plan: 'launch@1' },
});

// First, create the maximum number of plugins (3 for launch plan)
for (let i = 1; i <= 3; i++) {
// First, create the maximum number of plugins (10 for launch plan)
for (let i = 1; i <= 10; i++) {
const pluginName = genID(`plugin-${i}`);
const pluginLabel = genUniqueLabel(`plugin-${i}`);

Expand Down
23 changes: 19 additions & 4 deletions controlplane/test/subgraph/publish-subgraph.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
genID,
genUniqueLabel,
} from '../../src/core/test-util.js';
import { createEventDrivenGraph, createSubgraph, eventDrivenGraphSDL, SetupTest, subgraphSDL } from '../test-util.js';
import { createEventDrivenGraph, createSubgraph, DEFAULT_NAMESPACE, eventDrivenGraphSDL, SetupTest, subgraphSDL } from '../test-util.js';

// Read the actual proto, mapping and lock files
const testDataPath = path.join(process.cwd(), 'test/test-data/plugin');
Expand Down Expand Up @@ -476,14 +476,29 @@ describe('Publish subgraph tests', () => {
test('Should enforce plugin limits when creating plugin via publish', async () => {
const { client, server } = await SetupTest({
dbname,
setupBilling: { plan: 'developer@1' }, // Developer plan has 0 plugin limit
setupBilling: { plan: 'developer@1' }, // Developer plan has 3 plugin limit
});

const pluginName = genID('plugin');
// Create 3 plugins successfully
for (let i = 1; i <= 3; i++) {
const pluginName = genID(`plugin-${i}`);
const pluginLabel = genUniqueLabel(`team-${i}`);

const createPluginSubgraphResp = await client.createFederatedSubgraph({
name: pluginName,
namespace: DEFAULT_NAMESPACE,
type: SubgraphType.GRPC_PLUGIN,
labels: [pluginLabel],
});

expect(createPluginSubgraphResp.response?.code).toBe(EnumStatusCode.OK);
}

const fourthPluginName = genID('plugin-4');

// Try to publish to a non-existent plugin subgraph on developer plan
const publishResponse = await client.publishFederatedSubgraph({
name: pluginName,
name: fourthPluginName,
namespace: 'default',
schema: pluginSDL,
type: SubgraphType.GRPC_PLUGIN,
Expand Down