Skip to content

Commit a844237

Browse files
authored
Merge pull request #81 from mitre-attack/main
Merge main into next
2 parents 9955868 + 2b50c25 commit a844237

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

docusaurus/docs/principles/why-typescript.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Q: Many of our users primarily use Python, so why did we choose to create a Type
88

99
A: We chose TypeScript because it filled a need we had to manage multiple websites such as the
1010
[ATT&CK Navigator](https://github.com/mitre-attack/attack-navigator),
11-
[ATT&CK Workbench](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend),
11+
[ATT&CK Workbench](https://github.com/mitre-attack/attack-workbench-frontend),
1212
and a future redesigned ATT&CK website.
1313
These websites all parse the ATT&CK STIX bundles with the same logic spread out across different codebases.
1414
By consolidating the logic into a single TypeScript-based data model, we can ensure consistency and reduce the risk of errors.

docusaurus/schemas/archived-changelog.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ The contents of this repository is not affected, but you can find ATT&CK in STIX
6565
|:--------|:-----------------------------------------------------:|:-------------------------------------------------------------------------:|
6666
| Added `x_mitre_modified_by_ref` field to all object types. This field tracks the identity of the individual or organization which created the current _version_ of the object. | :x: | :white_check_mark: |
6767
| Added `x_mitre_domains` field to all non-relationship objects. This field tracks the domains the object is found in. | :x: | :white_check_mark: |
68-
| Added [collection](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/blob/master/docs/collections.md) objects to track information about specific releases of the dataset and to allow the dataset to be imported into [ATT&CK Workbench](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/). | :x: | :white_check_mark: |
69-
| Added a [collection index](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/blob/master/docs/collections.md) to list the contents of this repository and to allow the data to be imported into [ATT&CK Workbench](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/). | :x: | :white_check_mark: |
68+
| Added [collection](https://github.com/mitre-attack/attack-workbench-frontend/blob/master/docs/collections.md) objects to track information about specific releases of the dataset and to allow the dataset to be imported into [ATT&CK Workbench](https://github.com/mitre-attack/attack-workbench-frontend/). | :x: | :white_check_mark: |
69+
| Added a [collection index](https://github.com/mitre-attack/attack-workbench-frontend/blob/master/docs/collections.md) to list the contents of this repository and to allow the data to be imported into [ATT&CK Workbench](https://github.com/mitre-attack/attack-workbench-frontend/). | :x: | :white_check_mark: |
7070

7171
## 29 April 2021
7272

docusaurus/schemas_versioned_docs/version-3.3.0/archived-changelog.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ The contents of this repository is not affected, but you can find ATT&CK in STIX
6565
|:--------|:-----------------------------------------------------:|:-------------------------------------------------------------------------:|
6666
| Added `x_mitre_modified_by_ref` field to all object types. This field tracks the identity of the individual or organization which created the current _version_ of the object. | :x: | :white_check_mark: |
6767
| Added `x_mitre_domains` field to all non-relationship objects. This field tracks the domains the object is found in. | :x: | :white_check_mark: |
68-
| Added [collection](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/blob/master/docs/collections.md) objects to track information about specific releases of the dataset and to allow the dataset to be imported into [ATT&CK Workbench](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/). | :x: | :white_check_mark: |
69-
| Added a [collection index](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/blob/master/docs/collections.md) to list the contents of this repository and to allow the data to be imported into [ATT&CK Workbench](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/). | :x: | :white_check_mark: |
68+
| Added [collection](https://github.com/mitre-attack/attack-workbench-frontend/blob/master/docs/collections.md) objects to track information about specific releases of the dataset and to allow the dataset to be imported into [ATT&CK Workbench](https://github.com/mitre-attack/attack-workbench-frontend/). | :x: | :white_check_mark: |
69+
| Added a [collection index](https://github.com/mitre-attack/attack-workbench-frontend/blob/master/docs/collections.md) to list the contents of this repository and to allow the data to be imported into [ATT&CK Workbench](https://github.com/mitre-attack/attack-workbench-frontend/). | :x: | :white_check_mark: |
7070

7171
## 29 April 2021
7272

docusaurus/schemas_versioned_docs/version-3.3.0/sdo/collection.schema.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Collection
44

5-
See our [collections document](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/blob/main/docs/collections.md) for more information about the design and intention of collection objects.
5+
See our [collections document](https://github.com/mitre-attack/attack-workbench-frontend/blob/main/docs/collections.md) for more information about the design and intention of collection objects.
66

77
_Object containing the following properties:_
88

src/schemas/sdo/collection.schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export const collectionSchema = attackBaseDomainObjectSchema
6464
.strict()
6565
.meta({
6666
description: `
67-
See our [collections document](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/blob/main/docs/collections.md) for more information about the design and intention of collection objects.
67+
See our [collections document](https://github.com/mitre-attack/attack-workbench-frontend/blob/main/docs/collections.md) for more information about the design and intention of collection objects.
6868
`.trim(),
6969
});
7070

src/schemas/sdo/detection-strategy.schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { z } from 'zod/v4';
2+
import { validateNoDuplicates } from '../../refinements/index.js';
23
import { attackBaseDomainObjectSchema } from '../common/index.js';
34
import {
45
createAttackExternalReferencesSchema,
@@ -8,7 +9,6 @@ import {
89
xMitreDomainsSchema,
910
xMitreModifiedByRefSchema,
1011
} from '../common/property-schemas/index.js';
11-
import { validateNoDuplicates } from '../../refinements/index.js';
1212

1313
//==============================================================================
1414
//

0 commit comments

Comments
 (0)