Skip to content

Update Core Service Collection Creations #2286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nsdeschenes merged 4 commits into from
May 27, 2021
Merged

Update Core Service Collection Creations #2286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2497d41
update core service create_collections
nsdeschenes May 26, 2021
9db065b
update replication factor to 3
nsdeschenes May 26, 2021
b2a58b1
update database options
nsdeschenes May 26, 2021
719cf8a
update dmarc-report database options
nsdeschenes May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions services/core/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,12 @@ def update_guidance(
for entry in guidance_data:
if entry["file"] == "scanSummaryCriteria.json":
if not db.has_collection("scanSummaryCriteria"):
db.create_collection("scanSummaryCriteria")
db.create_collection(
name="scanSummaryCriteria",
replication_factor=3,
shard_count=6,
write_concern=1,
)
for criteria_type, criteria in entry["guidance"].items():
new_criteria = {
"_key": criteria_type,
Expand Down Expand Up @@ -153,7 +158,12 @@ def update_guidance(

elif entry["file"] == "chartSummaryCriteria.json":
if not db.has_collection("chartSummaryCriteria"):
db.create_collection("chartSummaryCriteria")
db.create_collection(
"chartSummaryCriteria",
replication_factor=3,
shard_count=6,
write_concern=1,
)
for criteria_type, criteria in entry["guidance"].items():
new_criteria = {
"_key": criteria_type,
Expand Down Expand Up @@ -191,7 +201,12 @@ def update_guidance(
file_name = entry["file"].split(".json")[0]
tag_type = file_name.split("tags_")[1]
if not db.has_collection(f"{tag_type}GuidanceTags"):
db.create_collection(f"{tag_type}GuidanceTags")
db.create_collection(
f"{tag_type}GuidanceTags",
replication_factor=3,
shard_count=6,
write_concern=1,
)
for tag_key, tag_data in entry["guidance"].items():
new_tag = {
"_key": tag_key,
Expand Down Expand Up @@ -242,7 +257,12 @@ def update_scan_summaries(host=DB_HOST, name=DB_NAME, user=DB_USER, password=DB_
db = client.db(name, username=user, password=password)

if not db.has_collection("scanSummaries"):
db.create_collection("scanSummaries")
db.create_collection(
"scanSummaries",
replication_factor=3,
shard_count=6,
write_concern=1,
)

for scan_type in SCAN_TYPES:
scan_pass = 0
Expand Down Expand Up @@ -288,7 +308,12 @@ def update_chart_summaries(host=DB_HOST, name=DB_NAME, user=DB_USER, password=DB
db = client.db(name, username=user, password=password)

if not db.has_collection("chartSummaries"):
db.create_collection("chartSummaries")
db.create_collection(
"chartSummaries",
replication_factor=3,
shard_count=6,
write_concern=1,
)

for chart_type, scan_types in CHARTS.items():
pass_count = 0
Expand Down
86 changes: 6 additions & 80 deletions services/dmarc-report/database-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,108 +1,34 @@
const databaseOptions = ({ rootPass }) => [
{ type: 'user', username: 'root', password: rootPass },
{
type: 'documentcollection',
name: 'users',
},
{
type: 'documentcollection',
name: 'organizations',
options: { replicationFactor: 3, writeConcern: 1, numberOfShards: 6 },
},
{
type: 'documentcollection',
name: 'domains',
},
{
type: 'documentcollection',
name: 'dkim',
},
{
type: 'documentcollection',
name: 'dkimResults',
},
{
type: 'documentcollection',
name: 'dmarc',
},
{
type: 'documentcollection',
name: 'spf',
},
{
type: 'documentcollection',
name: 'https',
},
{
type: 'documentcollection',
name: 'ssl',
},
{
type: 'documentcollection',
name: 'dkimGuidanceTags',
},
{
type: 'documentcollection',
name: 'dmarcGuidanceTags',
},
{
type: 'documentcollection',
name: 'spfGuidanceTags',
},
{
type: 'documentcollection',
name: 'httpsGuidanceTags',
},
{
type: 'documentcollection',
name: 'sslGuidanceTags',
},
{
type: 'documentcollection',
name: 'chartSummaries',
options: { replicationFactor: 3, writeConcern: 1, numberOfShards: 6 },
},
{
type: 'documentcollection',
name: 'dmarcSummaries',
},
{
type: 'edgecollection',
name: 'affiliations',
options: { replicationFactor: 3, writeConcern: 1, numberOfShards: 6 },
},
{
type: 'edgecollection',
name: 'claims',
},
{
type: 'edgecollection',
name: 'domainsDKIM',
},
{
type: 'edgecollection',
name: 'dkimToDkimResults',
},
{
type: 'edgecollection',
name: 'domainsDMARC',
},
{
type: 'edgecollection',
name: 'domainsSPF',
},
{
type: 'edgecollection',
name: 'domainsHTTPS',
},
{
type: 'edgecollection',
name: 'domainsSSL',
options: { replicationFactor: 3, writeConcern: 1, numberOfShards: 6 },
},
{
type: 'edgecollection',
name: 'ownership',
options: { replicationFactor: 3, writeConcern: 1, numberOfShards: 6 },
},
{
type: 'edgecollection',
name: 'domainsToDmarcSummaries',
options: { replicationFactor: 3, writeConcern: 1, numberOfShards: 6 },
},
]

Expand Down
3 changes: 3 additions & 0 deletions services/super-admin/database-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@ const databaseOptions = ({ rootPass }) => [
{
type: 'documentcollection',
name: 'users',
options: { replicationFactor: 3, writeConcern: 1, numberOfShards: 6 },
},
{
type: 'documentcollection',
name: 'organizations',
options: { replicationFactor: 3, writeConcern: 1, numberOfShards: 6 },
},
{
type: 'edgecollection',
name: 'affiliations',
options: { replicationFactor: 3, writeConcern: 1, numberOfShards: 6 },
},
]

Expand Down