Refactor to use getEffectivePolicy

JupiterOne-Archives · Feb 28, 2022 · 3e34096 · 3e34096
1 parent 71a031d
commit 3e34096
Show file tree

Hide file tree

Showing 34 changed files with 3,659 additions and 14,022 deletions.
diff --git a/src/getStepStartStates.ts b/src/getStepStartStates.ts
@@ -146,7 +146,6 @@ import {
 import { STEP_BILLING_ACCOUNTS } from './steps/cloud-billing/constants';
 import { isMasterOrganizationInstance } from './utils/isMasterOrganizationInstance';
 import { isSingleProjectInstance } from './utils/isSingleProjectInstance';
-import { STEP_ORGANIZATION_POLICIES } from './steps/orgpolicy/constants';
 
 function validateInvocationConfig(
   context: IntegrationExecutionContext<SerializedIntegrationConfig>,
@@ -305,7 +304,6 @@ export default async function getStepStartStates(
     // This API will be enabled otherwise fetching services names above would fail
     [STEP_RESOURCE_MANAGER_PROJECT]: { disabled: false },
     [STEP_API_SERVICES]: { disabled: false },
-    [STEP_ORGANIZATION_POLICIES]: { disabled: false },
     [STEP_IAM_BINDINGS]: createStartStatesBasedOnServiceAccountProject(
       ServiceUsageName.CLOUD_ASSET,
       ServiceUsageName.IAM,

diff --git a/src/index.test.ts b/src/index.test.ts
@@ -157,7 +157,6 @@ import {
   STEP_BUILD_PROJECT_BUDGET,
 } from './steps/billing-budgets/constants';
 import { STEP_BILLING_ACCOUNTS } from './steps/cloud-billing/constants';
-import { STEP_ORGANIZATION_POLICIES } from './steps/orgpolicy/constants';
 
 interface ValidateInvocationInvalidConfigTestParams {
   instanceConfig?: Partial<IntegrationConfig>;
@@ -413,9 +412,6 @@ describe('#getStepStartStates success', () => {
       [STEP_RESOURCE_MANAGER_FOLDERS]: {
         disabled: false,
       },
-      [STEP_ORGANIZATION_POLICIES]: {
-        disabled: false,
-      },
       [STEP_RESOURCE_MANAGER_ORG_PROJECT_RELATIONSHIPS]: {
         disabled: false,
       },

diff --git a/src/index.ts b/src/index.ts
@@ -33,7 +33,6 @@ import { Client } from './google-cloud/client';
 import { cloudAssetSteps } from './steps/cloud-asset';
 import { bigTableSteps } from './steps/big-table';
 import { maybeDefaultProjectIdOnEntity } from './utils/maybeDefaultProjectIdOnEntity';
-import { orgPolicySteps } from './steps/orgpolicy';
 
 export const invocationConfig: IntegrationInvocationConfig<IntegrationConfig> =
   {
@@ -86,7 +85,6 @@ export const invocationConfig: IntegrationInvocationConfig<IntegrationConfig> =
       ...bigTableSteps,
       ...billingBudgetsSteps,
       ...cloudBillingSteps,
-      ...orgPolicySteps,
     ],
     dependencyGraphOrder: ['last'],
     beforeAddEntity: maybeDefaultProjectIdOnEntity,