Revert "SALTO-4386 Handle deployment of issue type with hierarchy lev…

…el > 0 (#4760)" (#4788)
salto-io · Aug 27, 2023 · 868a0bb · 868a0bb
1 parent 5f6924b
commit 868a0bb
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 400 deletions.
diff --git a/packages/jira-adapter/src/adapter.ts b/packages/jira-adapter/src/adapter.ts
@@ -132,7 +132,6 @@ import projectCategoryFilter from './filters/project_category'
 import addAliasFilter from './filters/add_alias'
 import projectRoleRemoveTeamManagedDuplicatesFilter from './filters/remove_specific_duplicate_roles'
 import issueLayoutFilter from './filters/issue_layout/issue_layout'
-import issueTypeHierarchyFilter from './filters/issue_type_hierarchy_filter'
 import projectFieldContextOrder from './filters/project_field_contexts_order'
 import scriptedFieldsIssueTypesFilter from './filters/script_runner/scripted_fields_issue_types'
 import scriptRunnerFilter from './filters/script_runner/script_runner_filter'
@@ -240,7 +239,6 @@ export const DEFAULT_FILTERS = [
   notificationSchemeStructureFilter,
   notificationSchemeDeploymentFilter,
   issueTypeScreenSchemeFilter,
-  issueTypeHierarchyFilter,
   fieldConfigurationFilter,
   fieldConfigurationItemsFilter,
   fieldConfigurationSchemeFilter,

diff --git a/packages/jira-adapter/src/change_validators/index.ts b/packages/jira-adapter/src/change_validators/index.ts
@@ -56,7 +56,6 @@ import { projectCategoryValidator } from './project_category'
 import { unresolvedFieldConfigurationItemsValidator } from './unresolved_field_configuration_items'
 import { fieldSecondGlobalContextValidator } from './field_contexts/second_global_context'
 import { customFieldsWith10KOptionValidator } from './field_contexts/custom_field_with_10K_options'
-import { issueTypeHierarchyValidator } from './issue_type_hierarchy'
 
 const {
   deployTypesNotSupportedValidator,
@@ -110,7 +109,6 @@ export default (
     projectCategory: projectCategoryValidator(client),
     unresolvedFieldConfigurationItems: unresolvedFieldConfigurationItemsValidator,
     customFieldsWith10KOptions: customFieldsWith10KOptionValidator,
-    issueTypeHierarchy: issueTypeHierarchyValidator,
   }
 
   return createChangeValidator({

diff --git a/packages/jira-adapter/src/change_validators/issue_type_hierarchy.ts b/packages/jira-adapter/src/change_validators/issue_type_hierarchy.ts
diff --git a/packages/jira-adapter/src/config/config.ts b/packages/jira-adapter/src/config/config.ts
@@ -225,7 +225,6 @@ export type ChangeValidatorName = (
   | 'projectCategory'
   | 'unresolvedFieldConfigurationItems'
   | 'customFieldsWith10KOptions'
-  | 'issueTypeHierarchy'
   )
 
 type ChangeValidatorConfig = Partial<Record<ChangeValidatorName, boolean>>
@@ -273,7 +272,6 @@ const changeValidatorConfigType = createMatchingObjectType<ChangeValidatorConfig
     projectCategory: { refType: BuiltinTypes.BOOLEAN },
     unresolvedFieldConfigurationItems: { refType: BuiltinTypes.BOOLEAN },
     customFieldsWith10KOptions: { refType: BuiltinTypes.BOOLEAN },
-    issueTypeHierarchy: { refType: BuiltinTypes.BOOLEAN },
   },
   annotations: {
     [CORE_ANNOTATIONS.ADDITIONAL_PROPERTIES]: false,

diff --git a/packages/jira-adapter/src/filters/issue_type_hierarchy_filter.ts b/packages/jira-adapter/src/filters/issue_type_hierarchy_filter.ts
diff --git a/packages/jira-adapter/src/utils.ts b/packages/jira-adapter/src/utils.ts
@@ -99,8 +99,8 @@ export const isFreeLicense = async (
   const mainApplication = accountInfo.value.license.applications.find((app: Value) => app.id === 'jira-software')
 
   if (mainApplication?.plan === undefined) {
-    log.warn('could not find license of jira-software, treating the account as free one')
-    return true
+    log.error('could not find license of jira-software, treating the account as paid one')
+    return false
   }
   return mainApplication.plan === JIRA_FREE_PLAN
 }

diff --git a/packages/jira-adapter/test/change_validators/issue_type_hierarchy.test.ts b/packages/jira-adapter/test/change_validators/issue_type_hierarchy.test.ts