Skip to content

Pin cloudbuild arango version #4562

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
lcampbell2 merged 3 commits into from
May 30, 2023
Merged

Pin cloudbuild arango version #4562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6003ba5
update notify org footprint test
lcampbell2 May 29, 2023
cc7f729
Pin cloudbuild arango version
FestiveKyle May 30, 2023
23d0cb1
Merge branch 'fix-org-footprint-test' into pin-arango-cloudbuild
lcampbell2 May 30, 2023
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
2 changes: 1 addition & 1 deletion api/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ steps:
args:
[
'-c',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
]

- name: mikewilliamson/wait-for
Expand Down
2 changes: 1 addition & 1 deletion scanners/domain-dispatcher/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ steps:
args:
[
'-c',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
]

- name: mikewilliamson/wait-for
Expand Down
2 changes: 1 addition & 1 deletion scripts/domain-loader/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ steps:
args:
[
'-c',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
]

- name: mikewilliamson/wait-for
Expand Down
2 changes: 1 addition & 1 deletion services/dmarc-report/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ steps:
args:
[
'-c',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
]

- name: mikewilliamson/wait-for
Expand Down
2 changes: 1 addition & 1 deletion services/org-footprint/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ steps:
args:
[
'-c',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
]

- name: mikewilliamson/wait-for
Expand Down
6 changes: 6 additions & 0 deletions services/org-footprint/src/__tests__/notify-send-org-footprint-email.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,14 @@ describe('given the sendOrgFootprintEmail function', () => {
{
action: 'remove',
target: {
resource: 'domain1',
resourceType: 'domain',
},
},
{
action: 'update',
target: {
resource: 'domain2',
resourceType: 'domain',
},
},
Expand All @@ -67,8 +69,12 @@ describe('given the sendOrgFootprintEmail function', () => {
update_users_count: 0,
remove_users_count: 0,
add_domains_count: 0,
add_domains_list: '',
update_domains_count: 1,
update_domains_list: 'domain2',
remove_domains_count: 1,
remove_domains_list: 'domain1',
export_count: 0,
},
})
})
Expand Down
6 changes: 3 additions & 3 deletions services/org-footprint/src/notify/notify-send-org-footprint-email.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ const sendOrgFootprintEmail = async ({ notifyClient, user, auditLogs, orgNames }

// Get list of domains added
if (domainsAdded.length > 0) {
addDomainsList = '\t' + domainsAdded.map((log) => log.target.resource).join(', ')
addDomainsList = domainsAdded.map((log) => log.target.resource).join(', ')
}
// Get list of domains updated
if (domainsUpdated.length > 0) {
updateDomainsList = '\t' + domainsUpdated.map((log) => log.target.resource).join(', ')
updateDomainsList = domainsUpdated.map((log) => log.target.resource).join(', ')
}
// Get list of domains removed
if (domainsRemoved.length > 0) {
removeDomainsList = '\t' + domainsRemoved.map((log) => log.target.resource).join(', ')
removeDomainsList = domainsRemoved.map((log) => log.target.resource).join(', ')
}

const exportsToCsv = auditLogs.filter((log) => log.action === 'export')
Expand Down
2 changes: 1 addition & 1 deletion services/summaries/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ steps:
- name: 'gcr.io/cloud-builders/docker'
id: start_testdb
entrypoint: /bin/sh
args: ["-c", "docker run --net cloudbuild --name testdb -e ARANGO_NO_AUTH=1 -d -p 127.0.0.1:8529:8529 arangodb"]
args: ["-c", "docker run --net cloudbuild --name testdb -e ARANGO_NO_AUTH=1 -d -p 127.0.0.1:8529:8529 arangodb/arangodb:3.10.4"]

- name: mikewilliamson/wait-for
id: wait_testdb
Expand Down
2 changes: 1 addition & 1 deletion services/super-admin/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ steps:
args:
[
'-c',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
]

- name: mikewilliamson/wait-for
Expand Down