Skip to content
This repository has been archived by the owner on Sep 19, 2021. It is now read-only.

Commit

Permalink
Merge pull request #896 from 18F/develop
Browse files Browse the repository at this point in the history 
Merge in sprint ending 2018-09-25 + additional work through 2018-09-26
  • Loading branch information
@ryanhofdotgov
ryanhofdotgov authored Sep 27, 2018
2 parents f17d188 + 20eca41 commit 488a520
Show file tree
Hide file tree
Showing 170 changed files with 3,071 additions and 44,507 deletions.
16 changes: 8 additions & 8 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ package-lock.json
/api/checksum
/api/api
/api/eapp-seccomp.json
/api/cmd/server/server
/api/cmd/flush/flush
/api/cmd/unlock/unlock
/api/cmd/fuzzer/fuzzer
/api/cmd/load/load
/api/cmd/transmit/transmit
/api/cmd/compare/compare
/api/cmd/form/form
/api/bin/compare
/api/bin/flush
/api/bin/form
/api/bin/fuzzer
/api/bin/load
/api/bin/load-scenario
/api/bin/transmit
/api/bin/unlock
/build/
/doc/
/dist/
Expand Down
6 changes: 5 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ coverage-go:
#
# Building
#
build: build-frontend build-go reset-permissions
build: build-frontend build-go build-cmd reset-permissions
build-css:
$(info Compiling CSS)
@docker-compose run --rm css yarn build-css
Expand All @@ -116,6 +116,10 @@ build-frontend: build-css build-js
build-go:
$(info Compiling Go application)
@docker-compose run --rm api make build
build-cmd:
$(info Compiling Go commands)
docker-compose run --rm api make cmd


#
# Packaging
Expand Down
218 changes: 112 additions & 106 deletions api/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MAKEFLAGS += --silent
#MAKEFLAGS += --silent

all: clean test build

Expand All @@ -11,112 +11,118 @@ coverage:

build:
go build -o api ./cmd/server
chown -f 1000:1000 ./api
chown -f 1000:1000 api

clean:
rm -f ./cmd/compare/compare
rm -f ./cmd/flush/flush
rm -f ./cmd/form/form
rm -f ./cmd/fuzzer/fuzzer
rm -f ./cmd/load/load
rm -f ./cmd/server/server
rm -f ./cmd/transmit/transmit
rm -f ./cmd/unlock/unlock
rm -f api \
bin/compare bin/flush bin/form bin/fuzzer bin/load bin/load-scenario \
bin/transmit bin/unlock

specs:
cd ./cmd/compare; go build; cd ../..;
cd ./cmd/fuzzer; go build; cd ../..;
cd ./cmd/load; go build; cd ../..;
./cmd/fuzzer/fuzzer ./testdata/identification-birthdate.json \
./testdata/identification-birthplace.json \
./testdata/identification-comments.json \
./testdata/identification-contacts.json \
./testdata/identification-othernames.json \
./testdata/identification-physical.json \
./testdata/identification-ssn.json \
./testdata/identification-name.json \
./testdata/history-comments.json \
./testdata/history-education.json \
./testdata/history-employment.json \
./testdata/history-federal.json \
./testdata/history-residence.json \
./testdata/relationships-comments.json \
./testdata/relationships-people.json \
./testdata/relationships-relatives.json \
./testdata/relationships-status-cohabitant.json \
./testdata/relationships-status-marital.json \
./testdata/citizenship-comments.json \
./testdata/citizenship-multiple.json \
./testdata/citizenship-passports.json \
./testdata/citizenship-status.json \
./testdata/military-comments.json \
./testdata/military-disciplinary.json \
./testdata/military-foreign.json \
./testdata/military-history.json \
./testdata/military-selective.json \
./testdata/foreign-activities-benefits.json \
./testdata/foreign-activities-direct.json \
./testdata/foreign-activities-indirect.json \
./testdata/foreign-activities-realestate.json \
./testdata/foreign-activities-support.json \
./testdata/foreign-business-advice.json \
./testdata/foreign-business-conferences.json \
./testdata/foreign-business-contact.json \
./testdata/foreign-business-employment.json \
./testdata/foreign-business-family.json \
./testdata/foreign-business-political.json \
./testdata/foreign-business-sponsorship.json \
./testdata/foreign-business-ventures.json \
./testdata/foreign-business-voting.json \
./testdata/foreign-comments.json \
./testdata/foreign-contacts.json \
./testdata/foreign-passport.json \
./testdata/foreign-travel.json \
./testdata/financial-bankruptcy.json \
./testdata/financial-card.json \
./testdata/financial-comments.json \
./testdata/financial-credit.json \
./testdata/financial-delinquent.json \
./testdata/financial-gambling.json \
./testdata/financial-nonpayment.json \
./testdata/financial-taxes.json \
./testdata/substance-alcohol-additional.json \
./testdata/substance-alcohol-negative.json \
./testdata/substance-alcohol-ordered.json \
./testdata/substance-alcohol-voluntary.json \
./testdata/substance-comments.json \
./testdata/substance-drug-clearance.json \
./testdata/substance-drug-misuse.json \
./testdata/substance-drug-ordered.json \
./testdata/substance-drug-publicsafety.json \
./testdata/substance-drug-purchase.json \
./testdata/substance-drug-usage.json \
./testdata/substance-drug-voluntary.json \
./testdata/legal-associations-activities-to-overthrow.json \
./testdata/legal-associations-advocating.json \
./testdata/legal-associations-engaged-in-terrorism.json \
./testdata/legal-associations-membership-overthrow.json \
./testdata/legal-associations-membership-violence-or-force.json \
./testdata/legal-associations-terrorism-association.json \
./testdata/legal-associations-terrorist-organization.json \
./testdata/legal-comments.json \
./testdata/legal-court.json \
./testdata/legal-investigations-debarred.json \
./testdata/legal-investigations-history.json \
./testdata/legal-investigations-revoked.json \
./testdata/legal-police-additionaloffenses.json \
./testdata/legal-police-domesticviolence.json \
./testdata/legal-police-offenses.json \
./testdata/legal-technology-manipulating.json \
./testdata/legal-technology-unauthorized.json \
./testdata/legal-technology-unlawful.json \
./testdata/psychological-comments.json \
./testdata/psychological-competence.json \
./testdata/psychological-conditions.json \
./testdata/psychological-consultations.json \
./testdata/psychological-diagnoses.json \
./testdata/psychological-hospitalizations.json \
> fuzzed.json;
cat fuzzed.json | ./cmd/load/load;
cat fuzzed.json | ./cmd/compare/compare;
.PHONY: cmd
cmd:
go build -o bin/compare ./cmd/compare
go build -o bin/flush ./cmd/flush
go build -o bin/form ./cmd/form
go build -o bin/fuzzer ./cmd/fuzzer
go build -o bin/load ./cmd/load
go build -o bin/load-scenario ./cmd/load-scenario
go build -o bin/transmit ./cmd/transmit
go build -o bin/unlock ./cmd/unlock
chown -f 1000:1000 \
bin/compare bin/flush bin/form bin/fuzzer bin/load bin/load-scenario \
bin/transmit bin/unlock

specs: cmd
./bin/fuzzer testdata/identification-birthdate.json \
testdata/identification-birthplace.json \
testdata/identification-comments.json \
testdata/identification-contacts.json \
testdata/identification-othernames.json \
testdata/identification-physical.json \
testdata/identification-ssn.json \
testdata/identification-name.json \
testdata/history-comments.json \
testdata/history-education.json \
testdata/history-employment.json \
testdata/history-federal.json \
testdata/history-residence.json \
testdata/relationships-comments.json \
testdata/relationships-people.json \
testdata/relationships-relatives.json \
testdata/relationships-status-cohabitant.json \
testdata/relationships-status-marital.json \
testdata/citizenship-comments.json \
testdata/citizenship-multiple.json \
testdata/citizenship-passports.json \
testdata/citizenship-status.json \
testdata/military-comments.json \
testdata/military-disciplinary.json \
testdata/military-foreign.json \
testdata/military-history.json \
testdata/military-selective.json \
testdata/foreign-activities-benefits.json \
testdata/foreign-activities-direct.json \
testdata/foreign-activities-indirect.json \
testdata/foreign-activities-realestate.json \
testdata/foreign-activities-support.json \
testdata/foreign-business-advice.json \
testdata/foreign-business-conferences.json \
testdata/foreign-business-contact.json \
testdata/foreign-business-employment.json \
testdata/foreign-business-family.json \
testdata/foreign-business-political.json \
testdata/foreign-business-sponsorship.json \
testdata/foreign-business-ventures.json \
testdata/foreign-business-voting.json \
testdata/foreign-comments.json \
testdata/foreign-contacts.json \
testdata/foreign-passport.json \
testdata/foreign-travel.json \
testdata/financial-bankruptcy.json \
testdata/financial-card.json \
testdata/financial-comments.json \
testdata/financial-credit.json \
testdata/financial-delinquent.json \
testdata/financial-gambling.json \
testdata/financial-nonpayment.json \
testdata/financial-taxes.json \
testdata/substance-alcohol-additional.json \
testdata/substance-alcohol-negative.json \
testdata/substance-alcohol-ordered.json \
testdata/substance-alcohol-voluntary.json \
testdata/substance-comments.json \
testdata/substance-drug-clearance.json \
testdata/substance-drug-misuse.json \
testdata/substance-drug-ordered.json \
testdata/substance-drug-publicsafety.json \
testdata/substance-drug-purchase.json \
testdata/substance-drug-usage.json \
testdata/substance-drug-voluntary.json \
testdata/legal-associations-activities-to-overthrow.json \
testdata/legal-associations-advocating.json \
testdata/legal-associations-engaged-in-terrorism.json \
testdata/legal-associations-membership-overthrow.json \
testdata/legal-associations-membership-violence-or-force.json \
testdata/legal-associations-terrorism-association.json \
testdata/legal-associations-terrorist-organization.json \
testdata/legal-comments.json \
testdata/legal-court.json \
testdata/legal-investigations-debarred.json \
testdata/legal-investigations-history.json \
testdata/legal-investigations-revoked.json \
testdata/legal-police-additionaloffenses.json \
testdata/legal-police-domesticviolence.json \
testdata/legal-police-offenses.json \
testdata/legal-technology-manipulating.json \
testdata/legal-technology-unauthorized.json \
testdata/legal-technology-unlawful.json \
testdata/psychological-comments.json \
testdata/psychological-competence.json \
testdata/psychological-conditions.json \
testdata/psychological-consultations.json \
testdata/psychological-diagnoses.json \
testdata/psychological-hospitalizations.json \
> fuzzed.json;
cat fuzzed.json | ./bin/load;
cat fuzzed.json | ./bin/compare;
rm -f ./fuzzed.json;
Loading

0 comments on commit 488a520

Please sign in to comment.