From 78bdcdab5a5a827a546bc67d3dc9eaaa69283779 Mon Sep 17 00:00:00 2001 From: Laurin Quast Date: Wed, 14 Aug 2024 11:34:12 +0200 Subject: [PATCH] chore: codegen updates (#5378) --- .../src/modules/alerts/resolvers/Project.ts | 2 +- .../app-deployments/resolvers/Organization.ts | 2 +- .../app-deployments/resolvers/Target.ts | 2 +- .../api/src/modules/auth/resolvers/Member.ts | 1 + .../api/src/modules/auth/resolvers/User.ts | 2 +- .../modules/billing/resolvers/Organization.ts | 5 +++- .../api/src/modules/cdn/resolvers/Contract.ts | 2 +- .../api/src/modules/cdn/resolvers/Target.ts | 2 +- .../integrations/resolvers/Organization.ts | 2 +- .../modules/integrations/resolvers/Project.ts | 2 +- .../resolvers/Organization.ts | 2 +- .../oidc-integrations/resolvers/User.ts | 2 +- .../modules/policy/resolvers/Organization.ts | 2 +- .../src/modules/policy/resolvers/Project.ts | 25 ++++++++++--------- .../src/modules/policy/resolvers/Target.ts | 2 +- .../modules/project/resolvers/Organization.ts | 2 +- .../src/modules/project/resolvers/Project.ts | 1 + .../rate-limit/resolvers/Organization.ts | 2 +- .../modules/support/resolvers/Organization.ts | 5 +++- .../src/modules/target/resolvers/Project.ts | 2 +- .../src/modules/target/resolvers/Target.ts | 1 + .../api/src/modules/token/resolvers/Target.ts | 2 +- 22 files changed, 40 insertions(+), 30 deletions(-) diff --git a/packages/services/api/src/modules/alerts/resolvers/Project.ts b/packages/services/api/src/modules/alerts/resolvers/Project.ts index 72383e768..e5fafde8b 100644 --- a/packages/services/api/src/modules/alerts/resolvers/Project.ts +++ b/packages/services/api/src/modules/alerts/resolvers/Project.ts @@ -1,7 +1,7 @@ import { AlertsManager } from '../providers/alerts-manager'; import type { ProjectResolvers } from './../../../__generated__/types.next'; -export const Project: Pick = { +export const Project: Pick = { alerts: async (project, _, { injector }) => { return injector.get(AlertsManager).getAlerts({ organization: project.orgId, diff --git a/packages/services/api/src/modules/app-deployments/resolvers/Organization.ts b/packages/services/api/src/modules/app-deployments/resolvers/Organization.ts index 4c9aefe15..599278a01 100644 --- a/packages/services/api/src/modules/app-deployments/resolvers/Organization.ts +++ b/packages/services/api/src/modules/app-deployments/resolvers/Organization.ts @@ -9,7 +9,7 @@ import type { OrganizationResolvers } from './../../../__generated__/types.next' * * If you want to skip this file generation, remove the mapper or update the pattern in the `resolverGeneration.object` config. */ -export const Organization: Pick = { +export const Organization: Pick = { /* Implement Organization resolver logic here */ isAppDeploymentsEnabled(appDeployment) { return appDeployment.featureFlags.appDeployments; diff --git a/packages/services/api/src/modules/app-deployments/resolvers/Target.ts b/packages/services/api/src/modules/app-deployments/resolvers/Target.ts index 2a16a4417..08aaa727b 100644 --- a/packages/services/api/src/modules/app-deployments/resolvers/Target.ts +++ b/packages/services/api/src/modules/app-deployments/resolvers/Target.ts @@ -10,7 +10,7 @@ import type { TargetResolvers } from './../../../__generated__/types.next'; * * If you want to skip this file generation, remove the mapper or update the pattern in the `resolverGeneration.object` config. */ -export const Target: Pick = { +export const Target: Pick = { /* Implement Target resolver logic here */ appDeployment: async (target, args, { injector }) => { return injector.get(AppDeploymentsManager).getAppDeploymentForTarget(target, { diff --git a/packages/services/api/src/modules/auth/resolvers/Member.ts b/packages/services/api/src/modules/auth/resolvers/Member.ts index ac626ed6a..3434ec9d8 100644 --- a/packages/services/api/src/modules/auth/resolvers/Member.ts +++ b/packages/services/api/src/modules/auth/resolvers/Member.ts @@ -9,6 +9,7 @@ export const Member: Pick< | 'projectAccessScopes' | 'targetAccessScopes' | 'user' + | '__isTypeOf' > = { organizationAccessScopes: (member, _, { injector }) => { return injector.get(AuthManager).getMemberOrganizationScopes({ diff --git a/packages/services/api/src/modules/auth/resolvers/User.ts b/packages/services/api/src/modules/auth/resolvers/User.ts index aad4b72d1..1abfff3e6 100644 --- a/packages/services/api/src/modules/auth/resolvers/User.ts +++ b/packages/services/api/src/modules/auth/resolvers/User.ts @@ -2,5 +2,5 @@ import type { UserResolvers } from './../../../__generated__/types.next'; export const User: Pick< UserResolvers, - 'displayName' | 'email' | 'fullName' | 'id' | 'isAdmin' | 'provider' + 'displayName' | 'email' | 'fullName' | 'id' | 'isAdmin' | 'provider' | '__isTypeOf' > = {}; diff --git a/packages/services/api/src/modules/billing/resolvers/Organization.ts b/packages/services/api/src/modules/billing/resolvers/Organization.ts index e3c1050b7..c04105a1e 100644 --- a/packages/services/api/src/modules/billing/resolvers/Organization.ts +++ b/packages/services/api/src/modules/billing/resolvers/Organization.ts @@ -1,7 +1,10 @@ import { BillingProvider } from '../providers/billing.provider'; import type { BillingPlanType, OrganizationResolvers } from './../../../__generated__/types.next'; -export const Organization: Pick = { +export const Organization: Pick< + OrganizationResolvers, + 'billingConfiguration' | 'plan' | '__isTypeOf' +> = { plan: org => (org.billingPlan || 'HOBBY') as BillingPlanType, billingConfiguration: async (org, _args, { injector }) => { if (org.billingPlan === 'ENTERPRISE') { diff --git a/packages/services/api/src/modules/cdn/resolvers/Contract.ts b/packages/services/api/src/modules/cdn/resolvers/Contract.ts index c7b8ac6dd..2da806c9c 100644 --- a/packages/services/api/src/modules/cdn/resolvers/Contract.ts +++ b/packages/services/api/src/modules/cdn/resolvers/Contract.ts @@ -1,7 +1,7 @@ import { CdnProvider } from '../providers/cdn.provider'; import type { ContractResolvers } from './../../../__generated__/types.next'; -export const Contract: Pick = { +export const Contract: Pick = { cdnUrl: (contract, _, context) => { return context.injector.get(CdnProvider).getCdnUrlForContract(contract); }, diff --git a/packages/services/api/src/modules/cdn/resolvers/Target.ts b/packages/services/api/src/modules/cdn/resolvers/Target.ts index 9aaab4c4c..0ac95fe8b 100644 --- a/packages/services/api/src/modules/cdn/resolvers/Target.ts +++ b/packages/services/api/src/modules/cdn/resolvers/Target.ts @@ -1,7 +1,7 @@ import { CdnProvider } from '../providers/cdn.provider'; import type { TargetResolvers } from './../../../__generated__/types.next'; -export const Target: Pick = { +export const Target: Pick = { cdnAccessTokens: async (target, args, context) => { const result = await context.injector.get(CdnProvider).getPaginatedCDNAccessTokensForTarget({ targetId: target.id, diff --git a/packages/services/api/src/modules/integrations/resolvers/Organization.ts b/packages/services/api/src/modules/integrations/resolvers/Organization.ts index cd7bd8562..a9a61589a 100644 --- a/packages/services/api/src/modules/integrations/resolvers/Organization.ts +++ b/packages/services/api/src/modules/integrations/resolvers/Organization.ts @@ -4,7 +4,7 @@ import type { OrganizationResolvers } from './../../../__generated__/types.next' export const Organization: Pick< OrganizationResolvers, - 'gitHubIntegration' | 'hasGitHubIntegration' | 'hasSlackIntegration' + 'gitHubIntegration' | 'hasGitHubIntegration' | 'hasSlackIntegration' | '__isTypeOf' > = { gitHubIntegration: async (organization, _, { injector }) => { const repositories = await injector.get(GitHubIntegrationManager).getRepositories({ diff --git a/packages/services/api/src/modules/integrations/resolvers/Project.ts b/packages/services/api/src/modules/integrations/resolvers/Project.ts index d891824ae..4f770c9d8 100644 --- a/packages/services/api/src/modules/integrations/resolvers/Project.ts +++ b/packages/services/api/src/modules/integrations/resolvers/Project.ts @@ -1,6 +1,6 @@ import type { ProjectResolvers } from './../../../__generated__/types.next'; -export const Project: Pick = { +export const Project: Pick = { isProjectNameInGitHubCheckEnabled: project => { return project.useProjectNameInGithubCheck; }, diff --git a/packages/services/api/src/modules/oidc-integrations/resolvers/Organization.ts b/packages/services/api/src/modules/oidc-integrations/resolvers/Organization.ts index ba4a08391..b0180b519 100644 --- a/packages/services/api/src/modules/oidc-integrations/resolvers/Organization.ts +++ b/packages/services/api/src/modules/oidc-integrations/resolvers/Organization.ts @@ -3,7 +3,7 @@ import type { OrganizationResolvers } from './../../../__generated__/types.next' export const Organization: Pick< OrganizationResolvers, - 'oidcIntegration' | 'viewerCanManageOIDCIntegration' + 'oidcIntegration' | 'viewerCanManageOIDCIntegration' | '__isTypeOf' > = { oidcIntegration: async (organization, _, { injector }) => { if (injector.get(OIDCIntegrationsProvider).isEnabled() === false) { diff --git a/packages/services/api/src/modules/oidc-integrations/resolvers/User.ts b/packages/services/api/src/modules/oidc-integrations/resolvers/User.ts index b1ddbf990..43f3d8beb 100644 --- a/packages/services/api/src/modules/oidc-integrations/resolvers/User.ts +++ b/packages/services/api/src/modules/oidc-integrations/resolvers/User.ts @@ -1,5 +1,5 @@ import type { UserResolvers } from './../../../__generated__/types.next'; -export const User: Pick = { +export const User: Pick = { canSwitchOrganization: user => !user.oidcIntegrationId, }; diff --git a/packages/services/api/src/modules/policy/resolvers/Organization.ts b/packages/services/api/src/modules/policy/resolvers/Organization.ts index 20e54d744..977ecb70c 100644 --- a/packages/services/api/src/modules/policy/resolvers/Organization.ts +++ b/packages/services/api/src/modules/policy/resolvers/Organization.ts @@ -1,7 +1,7 @@ import { SchemaPolicyProvider } from '../providers/schema-policy.provider'; import type { OrganizationResolvers } from './../../../__generated__/types.next'; -export const Organization: Pick = { +export const Organization: Pick = { schemaPolicy: async (org, _, { injector }) => injector.get(SchemaPolicyProvider).getOrganizationPolicy({ organization: org.id, diff --git a/packages/services/api/src/modules/policy/resolvers/Project.ts b/packages/services/api/src/modules/policy/resolvers/Project.ts index 10e2f3720..8de461808 100644 --- a/packages/services/api/src/modules/policy/resolvers/Project.ts +++ b/packages/services/api/src/modules/policy/resolvers/Project.ts @@ -1,15 +1,16 @@ import { SchemaPolicyProvider } from '../providers/schema-policy.provider'; import type { ProjectResolvers } from './../../../__generated__/types.next'; -export const Project: Pick = { - schemaPolicy: async (project, _, { injector }) => - injector.get(SchemaPolicyProvider).getProjectPolicy({ - project: project.id, - organization: project.orgId, - }), - parentSchemaPolicy: async (project, _, { injector }) => - injector.get(SchemaPolicyProvider).getOrganizationPolicyForProject({ - project: project.id, - organization: project.orgId, - }), -}; +export const Project: Pick = + { + schemaPolicy: async (project, _, { injector }) => + injector.get(SchemaPolicyProvider).getProjectPolicy({ + project: project.id, + organization: project.orgId, + }), + parentSchemaPolicy: async (project, _, { injector }) => + injector.get(SchemaPolicyProvider).getOrganizationPolicyForProject({ + project: project.id, + organization: project.orgId, + }), + }; diff --git a/packages/services/api/src/modules/policy/resolvers/Target.ts b/packages/services/api/src/modules/policy/resolvers/Target.ts index ac719bd8b..92f2e1ab1 100644 --- a/packages/services/api/src/modules/policy/resolvers/Target.ts +++ b/packages/services/api/src/modules/policy/resolvers/Target.ts @@ -3,7 +3,7 @@ import { SchemaPolicyProvider } from '../providers/schema-policy.provider'; import { serializeSeverity } from '../utils'; import type { TargetResolvers } from './../../../__generated__/types.next'; -export const Target: Pick = { +export const Target: Pick = { schemaPolicy: async (target, _, { injector }) => { const { mergedPolicy, orgLevel, projectLevel } = await injector .get(SchemaPolicyProvider) diff --git a/packages/services/api/src/modules/project/resolvers/Organization.ts b/packages/services/api/src/modules/project/resolvers/Organization.ts index 7da3a7567..7151d7291 100644 --- a/packages/services/api/src/modules/project/resolvers/Organization.ts +++ b/packages/services/api/src/modules/project/resolvers/Organization.ts @@ -1,7 +1,7 @@ import { ProjectManager } from '../providers/project-manager'; import type { OrganizationResolvers } from './../../../__generated__/types.next'; -export const Organization: Pick = { +export const Organization: Pick = { projects: (organization, _, { injector }) => { return injector.get(ProjectManager).getProjects({ organization: organization.id }); }, diff --git a/packages/services/api/src/modules/project/resolvers/Project.ts b/packages/services/api/src/modules/project/resolvers/Project.ts index 3ee840973..c7c97bc8f 100644 --- a/packages/services/api/src/modules/project/resolvers/Project.ts +++ b/packages/services/api/src/modules/project/resolvers/Project.ts @@ -11,6 +11,7 @@ export const Project: Pick< | 'name' | 'type' | 'validationUrl' + | '__isTypeOf' > = { experimental_nativeCompositionPerTarget: async (project, _, { injector }) => { if (project.type !== ProjectType.FEDERATION) { diff --git a/packages/services/api/src/modules/rate-limit/resolvers/Organization.ts b/packages/services/api/src/modules/rate-limit/resolvers/Organization.ts index 55105df23..e49fafe25 100644 --- a/packages/services/api/src/modules/rate-limit/resolvers/Organization.ts +++ b/packages/services/api/src/modules/rate-limit/resolvers/Organization.ts @@ -2,7 +2,7 @@ import { Logger } from '../../shared/providers/logger'; import { RateLimitProvider } from '../providers/rate-limit.provider'; import type { OrganizationResolvers } from './../../../__generated__/types.next'; -export const Organization: Pick = { +export const Organization: Pick = { rateLimit: async (org, _args, { injector }) => { let limitedForOperations = false; const logger = injector.get(Logger); diff --git a/packages/services/api/src/modules/support/resolvers/Organization.ts b/packages/services/api/src/modules/support/resolvers/Organization.ts index 24ca1a06b..779b78945 100644 --- a/packages/services/api/src/modules/support/resolvers/Organization.ts +++ b/packages/services/api/src/modules/support/resolvers/Organization.ts @@ -1,7 +1,10 @@ import { SupportManager } from '../providers/support-manager'; import type { OrganizationResolvers } from './../../../__generated__/types.next'; -export const Organization: Pick = { +export const Organization: Pick< + OrganizationResolvers, + 'supportTicket' | 'supportTickets' | '__isTypeOf' +> = { supportTickets: async (org, args, { injector }) => { const response = await injector.get(SupportManager).getTickets(org.id); diff --git a/packages/services/api/src/modules/target/resolvers/Project.ts b/packages/services/api/src/modules/target/resolvers/Project.ts index 0196623ca..079e7d9f8 100644 --- a/packages/services/api/src/modules/target/resolvers/Project.ts +++ b/packages/services/api/src/modules/target/resolvers/Project.ts @@ -1,7 +1,7 @@ import { TargetManager } from '../providers/target-manager'; import type { ProjectResolvers } from './../../../__generated__/types.next'; -export const Project: Pick = { +export const Project: Pick = { targets: (project, _, { injector }) => { return injector.get(TargetManager).getTargets({ project: project.id, diff --git a/packages/services/api/src/modules/target/resolvers/Target.ts b/packages/services/api/src/modules/target/resolvers/Target.ts index f07449c2d..7a7fc0262 100644 --- a/packages/services/api/src/modules/target/resolvers/Target.ts +++ b/packages/services/api/src/modules/target/resolvers/Target.ts @@ -12,6 +12,7 @@ export const Target: Pick< | 'name' | 'project' | 'validationSettings' + | '__isTypeOf' > = { project: (target, _args, { injector }) => injector.get(ProjectManager).getProject({ diff --git a/packages/services/api/src/modules/token/resolvers/Target.ts b/packages/services/api/src/modules/token/resolvers/Target.ts index 6bb463318..6562a996d 100644 --- a/packages/services/api/src/modules/token/resolvers/Target.ts +++ b/packages/services/api/src/modules/token/resolvers/Target.ts @@ -1,7 +1,7 @@ import { TokenManager } from '../providers/token-manager'; import type { TargetResolvers } from './../../../__generated__/types.next'; -export const Target: Pick = { +export const Target: Pick = { tokens(target, _, { injector }) { return injector.get(TokenManager).getTokens({ target: target.id,