Fix introspection query policy types (#340)

Introspection query policy operates like a BasePolicy
Soluto · Aug 5, 2021 · 3e787bc · 3e787bc
1 parent 8e0fae6
commit 3e787bc
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 31 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stitch-cli",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "author": "Aviv Rozenboim @AvivRubys",
   "repository": "Soluto/stitch",
   "homepage": "https://github.com/Soluto/stitch",

diff --git a/cli/src/client/index.ts b/cli/src/client/index.ts
@@ -1,5 +1,5 @@
 import { GraphQLClient, gql } from 'graphql-request';
-import { BasePolicyInput, IntrospectionQueryPolicyInput, ResourceGroupInput } from './types';
+import { BasePolicyInput, ResourceGroupInput } from './types';
 
 export interface RequestInit {
   body?: BodyInit | null;
@@ -52,15 +52,15 @@ const ValidateBasePolicyQuery = gql`
 `;
 
 const UploadIntrospectionQueryPolicyMutation = gql`
-  mutation UploadIntrospectionQueryPolicyMutation($introspectionQueryPolicy: IntrospectionQueryPolicyInput!) {
+  mutation UploadIntrospectionQueryPolicyMutation($introspectionQueryPolicy: BasePolicyInput!) {
     result: updateIntrospectionQueryPolicy(input: $introspectionQueryPolicy) {
       success
     }
   }
 `;
 
 const ValidateIntrospectionQueryPolicyQuery = gql`
-  query ValidateIntrospectionQueryPolicyQuery($introspectionQueryPolicy: IntrospectionQueryPolicyInput!) {
+  query ValidateIntrospectionQueryPolicyQuery($introspectionQueryPolicy: BasePolicyInput!) {
     result: validateIntrospectionQueryPolicy(input: $introspectionQueryPolicy) {
       success
     }
@@ -122,7 +122,7 @@ export async function uploadBasePolicy(
 }
 
 export async function uploadIntrospectionQueryPolicy(
-  introspectionQueryPolicy: IntrospectionQueryPolicyInput,
+  introspectionQueryPolicy: BasePolicyInput,
   options: {
     registryUrl: string;
     dryRun?: boolean;

diff --git a/cli/src/client/types.ts b/cli/src/client/types.ts
@@ -95,7 +95,7 @@ export type MutationUpdateBasePolicyArgs = {
 };
 
 export type MutationUpdateIntrospectionQueryPolicyArgs = {
-  input: IntrospectionQueryPolicyInput;
+  input: BasePolicyInput;
 };
 
 export type SchemaInput = {
@@ -167,7 +167,7 @@ export type BasePolicyInput = {
   args?: Maybe<Scalars['JSONObject']>;
 };
 
-export type IntrospectionQueryPolicyInput = {
+export type BasePolicyInput = {
   namespace: Scalars['String'];
   name: Scalars['String'];
   args?: Maybe<Scalars['JSONObject']>;

diff --git a/cli/src/commands/apply/introspection-query-policy.ts b/cli/src/commands/apply/introspection-query-policy.ts
@@ -1,7 +1,7 @@
 import { promises as fs } from 'fs';
 import { safeLoad } from 'js-yaml';
 import Command, { flags } from '@oclif/command';
-import { IntrospectionQueryPolicyInput, uploadIntrospectionQueryPolicy } from '../../client';
+import { BasePolicyInput, uploadIntrospectionQueryPolicy } from '../../client';
 import getEnvInfo from '../../utils/get-env-info';
 
 export default class ApplyIntrospectionQueryPolicy extends Command {
@@ -34,7 +34,7 @@ export default class ApplyIntrospectionQueryPolicy extends Command {
     try {
       this.log(`${dryRun ? 'Verifying' : 'Uploading'} introspection query policy from ${args.resourcePath}...`);
       const introspectionQueryPolicyContent = await fs.readFile(args.resourcePath, { encoding: 'utf8' });
-      const introspectionQueryPolicy = safeLoad(introspectionQueryPolicyContent) as IntrospectionQueryPolicyInput;
+      const introspectionQueryPolicy = safeLoad(introspectionQueryPolicyContent) as BasePolicyInput;
 
       const {
         result: { success },

diff --git a/services/src/modules/apollo-server-plugins/introspection-query-policy.ts b/services/src/modules/apollo-server-plugins/introspection-query-policy.ts
@@ -31,7 +31,7 @@ function wrapWithPolicyValidation(field: GraphQLField<unknown, RequestContext>)
     const {
       resourceGroup: { introspectionQueryPolicy, basePolicy },
       policyExecutor,
-    } = (context as unknown) as RequestContext;
+    } = context as unknown as RequestContext;
 
     let policy = introspectionQueryPolicy;
 

diff --git a/services/src/modules/registry-schema/resolvers/index.ts b/services/src/modules/registry-schema/resolvers/index.ts
@@ -2,7 +2,6 @@ import { IResolvers } from 'graphql-tools';
 import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
 import {
   BasePolicyInput,
-  IntrospectionQueryPolicyInput,
   DefaultUpstreamInput,
   PolicyInput,
   ResourceGroupInput,
@@ -74,7 +73,7 @@ const resolvers: IResolvers = {
     validateBasePolicy: (_, args: { input: BasePolicyInput }, context) =>
       handleUpdateResourceGroupRequest({ basePolicy: args.input }, context, true),
 
-    validateIntrospectionQueryPolicy: (_, args: { input: IntrospectionQueryPolicyInput }, context) =>
+    validateIntrospectionQueryPolicy: (_, args: { input: BasePolicyInput }, context) =>
       handleUpdateResourceGroupRequest({ introspectionQueryPolicy: args.input }, context, true),
 
     validateDefaultUpstream: (_, args: { input: DefaultUpstreamInput }, context) =>
@@ -102,7 +101,7 @@ const resolvers: IResolvers = {
     updateBasePolicy: (_, args: { input: BasePolicyInput }, context) =>
       handleUpdateResourceGroupRequest({ basePolicy: args.input }, context),
 
-    updateIntrospectionQueryPolicy: (_, args: { input: IntrospectionQueryPolicyInput }, context) =>
+    updateIntrospectionQueryPolicy: (_, args: { input: BasePolicyInput }, context) =>
       handleUpdateResourceGroupRequest({ introspectionQueryPolicy: args.input }, context),
 
     setDefaultUpstream: (_, args: { input: DefaultUpstreamInput }, context) =>

diff --git a/services/src/modules/registry-schema/typedefs.ts b/services/src/modules/registry-schema/typedefs.ts
@@ -76,12 +76,6 @@ export default gql`
     args: JSONObject
   }
 
-  type IntrospectionQueryPolicy {
-    namespace: String!
-    name: String!
-    args: JSONObject
-  }
-
   type RemoteSchema {
     url: String!
     schema: String!
@@ -122,7 +116,7 @@ export default gql`
     policy(metadata: ResourceMetadataInput!, fromGatewayResources: Boolean): Policy
     policies(fromGatewayResources: Boolean): [Policy!]!
     basePolicy(fromGatewayResources: Boolean): BasePolicy
-    introspectionQueryPolicy(fromGatewayResources: Boolean): IntrospectionQueryPolicy
+    introspectionQueryPolicy(fromGatewayResources: Boolean): BasePolicy
 
     remoteSchemas: [RemoteSchema!]!
     remoteSchema(url: String!): RemoteSchema
@@ -133,7 +127,7 @@ export default gql`
     validateUpstreamClientCredentials(input: [UpstreamClientCredentialsInput!]!): Result
     validatePolicies(input: [PolicyInput!]!): Result
     validateBasePolicy(input: BasePolicyInput!): Result
-    validateIntrospectionQueryPolicy(input: IntrospectionQueryPolicyInput!): Result
+    validateIntrospectionQueryPolicy(input: BasePolicyInput!): Result
     validateDefaultUpstream(input: DefaultUpstreamInput!): Result
   }
 
@@ -146,7 +140,7 @@ export default gql`
     updateUpstreamClientCredentials(input: [UpstreamClientCredentialsInput!]!): Result
     updatePolicies(input: [PolicyInput!]!): Result
     updateBasePolicy(input: BasePolicyInput!): Result
-    updateIntrospectionQueryPolicy(input: IntrospectionQueryPolicyInput!): Result
+    updateIntrospectionQueryPolicy(input: BasePolicyInput!): Result
     setDefaultUpstream(input: DefaultUpstreamInput!): Result
 
     deleteResources(input: ResourceGroupMetadataInput!): Result
@@ -251,10 +245,4 @@ export default gql`
     name: String!
     args: JSONObject
   }
-
-  input IntrospectionQueryPolicyInput {
-    namespace: String!
-    name: String!
-    args: JSONObject
-  }
 `;
diff --git a/services/src/modules/registry-schema/types.ts b/services/src/modules/registry-schema/types.ts
@@ -39,7 +39,7 @@ export interface ResourceGroupInput {
   upstreamClientCredentials?: UpstreamClientCredentialsInput[];
   policies?: PolicyInput[];
   basePolicy?: BasePolicyInput;
-  introspectionQueryPolicy?: IntrospectionQueryPolicyInput;
+  introspectionQueryPolicy?: BasePolicyInput;
   defaultUpstream?: DefaultUpstreamInput;
 }
 
@@ -102,7 +102,7 @@ export interface BasePolicyInput {
   args?: PolicyArgsObject;
 }
 
-export interface IntrospectionQueryPolicyInput {
+export interface BasePolicyInput {
   namespace: string;
   name: string;
   args?: PolicyArgsObject;

diff --git a/services/tests/helpers/registry-request-builder.ts b/services/tests/helpers/registry-request-builder.ts
@@ -26,7 +26,7 @@ export const updateBasePolicyMutation = print(gql`
 `);
 
 export const updateIntrospectionQueryPolicyMutation = print(gql`
-  mutation UpdateIntrospectionQueryPolicy($introspectionQueryPolicy: IntrospectionQueryPolicyInput!) {
+  mutation UpdateIntrospectionQueryPolicy($introspectionQueryPolicy: BasePolicyInput!) {
     result: updateIntrospectionQueryPolicy(input: $introspectionQueryPolicy) {
       success
     }