Code

Combine LZ and DMZ develop branches#221

Code

Draft

aloftus23 wants to merge 112 commits intodevelopcisagov/XFD:developfrom 20-merge-lz-infracisagov/XFD:20-merge-lz-infraCopy head branch name to clipboard

+23,904-22,376

Commits

Commits on Mar 13, 2024

• Move over the lz-infra branch and capture updates

  aloftus23

  committed
  cd25a90

  Copy full SHA for cd25a90

• revert users.ts and app.ts

  aloftus23

  committed
  1ccfbb1

  Copy full SHA for 1ccfbb1

Commits on Mar 15, 2024

• Deployment updates

  aloftus23

  committed
  951fde2

  Copy full SHA for 951fde2

Commits on Mar 27, 2024

• Add email bucket and take out unnecessary allow origin list

  aloftus23

  committed
  9ae3b5c

  Copy full SHA for 9ae3b5c

Commits on May 2, 2024

• Merge .github/ and . files from develop

  aloftus23

  committed
  b0871be

  Copy full SHA for b0871be

• Merge more unrelated files from develop

  aloftus23

  committed
  8739ab2

  Copy full SHA for 8739ab2

• Merge new models and more unproblematic files

  aloftus23

  committed
  8eed1d2

  Copy full SHA for 8eed1d2

• Merge playwright

  aloftus23

  committed
  34b7653

  Copy full SHA for 34b7653

• unrelated file merge

  aloftus23

  committed
  06756ef

  Copy full SHA for 06756ef

• merge easy backend changes

  aloftus23

  committed
  e5eef8c

  Copy full SHA for e5eef8c

• Merge docs

  aloftus23

  committed
  fb85e93

  Copy full SHA for fb85e93

• merge frontend that aren't different b/w LZ and DMZ

  aloftus23

  committed
  1dd517a

  Copy full SHA for 1dd517a

• merge infrastructure

  aloftus23

  committed
  2fc55f9

  Copy full SHA for 2fc55f9

• Merge backend

  aloftus23

  committed
  082fa51

  Copy full SHA for 082fa51

• add staging-cd and prod-ls to env.yml

  aloftus23

  committed
  83a17eb

  Copy full SHA for 83a17eb

• Remove pe-source from dockerfile.worker and fix env.yml

  aloftus23

  committed
  5310092

  Copy full SHA for 5310092

• Conditionalize the serverless backend for DMZ vs PROD

  aloftus23

  committed
  4d89031

  Copy full SHA for 4d89031

• Fix backend/src/api files

  aloftus23

  committed
  e3f1f1c

  Copy full SHA for e3f1f1c

• Remove log changes in backend/src/tasks

  aloftus23

  committed
  3f7f25a

  Copy full SHA for 3f7f25a

• fix docs

  aloftus23

  committed
  233b2cf

  Copy full SHA for 233b2cf

• fix frontend

  aloftus23

  committed
  9b777df

  Copy full SHA for 9b777df

Commits on May 7, 2024

• Merge terraform DMZ and LZ

  aloftus23

  committed
  5c42d0f

  Copy full SHA for 5c42d0f

• Format terraform

  aloftus23

  committed
  4f214cf

  Copy full SHA for 4f214cf

Commits on May 9, 2024

• run linters

  aloftus23

  committed
  3da1302

  Copy full SHA for 3da1302

• Fix stage.config

  aloftus23

  committed
  260c2cc

  Copy full SHA for 260c2cc

• remove logger from helpers

  aloftus23

  committed
  9ee3651

  Copy full SHA for 9ee3651

• Fix variables in tfvars

  aloftus23

  committed
  0ec5091

  Copy full SHA for 0ec5091

• Fix var files

  aloftus23

  committed
  b073b73

  Copy full SHA for b073b73

• Add region to .github infra actions

  aloftus23

  committed
  3978099

  Copy full SHA for 3978099

• Update vpc_dmz to use 0 instead of count.index

  aloftus23

  committed
  9ecb68b

  Copy full SHA for 9ecb68b

• fix vpc_dmz cidrblock referance

  aloftus23

  committed
  89722ad

  Copy full SHA for 89722ad

• Make the allow worker_kms decrypt conditional

  aloftus23

  committed
  15f876b

  Copy full SHA for 15f876b

• Fix terraform policy

  aloftus23

  committed
  11e8e93

  Copy full SHA for 11e8e93

• fix policy

  aloftus23

  committed
  18611b7

  Copy full SHA for 18611b7

• fix lint

  aloftus23

  committed
  020699c

  Copy full SHA for 020699c

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  dd6b0d0

  Copy full SHA for dd6b0d0

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  2b79943

  Copy full SHA for 2b79943

• update package-lock.json

  aloftus23

  committed
  178435f

  Copy full SHA for 178435f

• fix lint

  aloftus23

  committed
  842aefe

  Copy full SHA for 842aefe

• fix infrastructure count.index

  aloftus23

  committed
  507fbba

  Copy full SHA for 507fbba

• Fix matomo terraform config

  aloftus23

  committed
  d84396f

  Copy full SHA for d84396f

• take out logger in search.ts

  aloftus23

  committed
  f29aa69

  Copy full SHA for f29aa69

• update logger to a require instead of import

  aloftus23

  committed
  2ba1c16

  Copy full SHA for 2ba1c16

• fix logger

  aloftus23

  committed
  1d28d5b

  Copy full SHA for 1d28d5b

Commits on May 10, 2024

• fix logger

  aloftus23

  committed
  af50818

  Copy full SHA for af50818

• fix lambda logger

  aloftus23

  committed
  9d01459

  Copy full SHA for 9d01459

• Fix backend serverless

  aloftus23

  committed
  9a0de2f

  Copy full SHA for 9a0de2f

• fix env.yml

  aloftus23

  committed
  d86fe1a

  Copy full SHA for d86fe1a

• Fix serverless framework

  aloftus23

  committed
  79996ba

  Copy full SHA for 79996ba

• Fix backend test

  aloftus23

  committed
  2d9b69e

  Copy full SHA for 2d9b69e

• fix env.yml

  aloftus23

  committed
  aaf3a63

  Copy full SHA for aaf3a63

• Revert serverless changes back

  aloftus23

  committed
  42babd2

  Copy full SHA for 42babd2

• Add region to dev env

  aloftus23

  committed
  ca80984

  Copy full SHA for ca80984

• Fix serverless deployment and run lint

  aloftus23

  committed
  ed886c3

  Copy full SHA for ed886c3

Commits on May 13, 2024

• Fix xss and privacy violations

  aloftus23

  committed
  9c57f86

  Copy full SHA for 9c57f86

• Merge branch 'AL-checkmarx-fix-2' into 20-merge-lz-infra

  aloftus23

  committed
  d251bdb

  Copy full SHA for d251bdb

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  6d55207

  Copy full SHA for 6d55207

Commits on May 15, 2024

• Update packages

  aloftus23

  committed
  200f2dd

  Copy full SHA for 200f2dd

Commits on May 17, 2024

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  af68221

  Copy full SHA for af68221

Commits on May 29, 2024

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  4547c00

  Copy full SHA for 4547c00

Commits on May 30, 2024

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  745c2da

  Copy full SHA for 745c2da

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  c4bd750

  Copy full SHA for c4bd750

Commits on May 31, 2024

• Update jwks

  aloftus23

  committed
  b2d9030

  Copy full SHA for b2d9030

Commits on Jun 13, 2024

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  d7cfae8

  Copy full SHA for d7cfae8

• commit latest changes

  aloftus23

  committed
  f7844ab

  Copy full SHA for f7844ab

Commits on Jul 9, 2024

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  99e31f5

  Copy full SHA for 99e31f5

• make sure sqs is only in dmz

  aloftus23

  committed
  b23294e

  Copy full SHA for b23294e

Commits on Jul 16, 2024

• Add material views as temporary cache

  aloftus23

  committed
  0cdf69c

  Copy full SHA for 0cdf69c

Commits on Jul 29, 2024

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  395e972

  Copy full SHA for 395e972

• remove python POC PR

  aloftus23

  committed
  3a1b087

  Copy full SHA for 3a1b087

• fix package lock files by running npm i

  aloftus23

  committed
  b218909

  Copy full SHA for b218909

Commits on Aug 2, 2024

• Update requirements for LZ

  aloftus23

  committed
  5fb071a

  Copy full SHA for 5fb071a

Commits on Aug 12, 2024

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  59a27b0

  Copy full SHA for 59a27b0

Commits on Aug 20, 2024

• Remove hibp

  aloftus23

  committed
  4464068

  Copy full SHA for 4464068

• Remove webscraper

  aloftus23

  committed
  77d9bad

  Copy full SHA for 77d9bad

• Fix lint

  aloftus23

  committed
  0638648

  Copy full SHA for 0638648

• Remove testProxy

  aloftus23

  committed
  606f20b

  Copy full SHA for 606f20b

Commits on Sep 10, 2024

• Fix bug fixes for 0.3.7

  aloftus23

  committed
  7c35b32

  Copy full SHA for 7c35b32

Commits on Sep 13, 2024

• Add useUserLevel

  aloftus23

  committed
  c4eda34

  Copy full SHA for c4eda34

Commits on Sep 24, 2024

• Update bastion.ts

  aloftus23

  committed
  646c542

  Copy full SHA for 646c542

Commits on Oct 2, 2024

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  37c2fd3

  Copy full SHA for 37c2fd3

• Revert hot fix PR

  aloftus23

  committed
  208f11f

  Copy full SHA for 208f11f

• Revert "Merge pull request #663 from cisagov/revert-662-dj-cidr_hot_fix-WIP"

  Show description for f7ca272
  aloftus23

  committed
  f7ca272

  Copy full SHA for f7ca272

• Revert hotfix PR

  aloftus23

  committed
  bda678d

  Copy full SHA for bda678d

• Revert "delete flagFloatingIps in order to rename it"

  Show description for 63ecd92
  aloftus23

  committed
  63ecd92

  Copy full SHA for 63ecd92

• Revert logging

  aloftus23

  committed
  1a175b6

  Copy full SHA for 1a175b6

• Revert "Merge pull request #648 from cisagov/crasm-621"

  Show description for 650f353
  aloftus23

  committed
  650f353

  Copy full SHA for 650f353

• Revert "Merge pull request #637 from cisagov/686-nvd-image-fix-vuln-details"

  Show description for 50f6247
  aloftus23

  committed
  50f6247

  Copy full SHA for 50f6247

• Revert "Merge pull request #641 from cisagov/skip-to-main-content"

  Show description for b452c68
  aloftus23

  committed
  b452c68

  Copy full SHA for b452c68

• update stats.py

  aloftus23

  committed
  829fef4

  Copy full SHA for 829fef4

• dleete flagfloatingips

  aloftus23

  committed
  a3c0434

  Copy full SHA for a3c0434

• Update package locks

  aloftus23

  committed
  8658d8b

  Copy full SHA for 8658d8b

Commits on Oct 3, 2024

• Add Dane hotfix. Filer domains by Fceb or from Cidr

  

  DJensen94

  authored and

  aloftus23

  committed
  a419c33

  Copy full SHA for a419c33

• fix material views and mdl in env.yml

  aloftus23

  committed
  1337696

  Copy full SHA for 1337696

• Enhance flagFloatingIps (#667)

  Show description for 41c23a4
  

  DJensen94

  authored and

  aloftus23

  committed
  41c23a4

  Copy full SHA for 41c23a4

Commits on Oct 4, 2024

• Revert "Enhance flagFloatingIps (#667)"

  Show description for 40e340b
  aloftus23

  committed
  40e340b

  Copy full SHA for 40e340b

• update vulns

  aloftus23

  committed
  8d9023b

  Copy full SHA for 8d9023b

• update memory

  aloftus23

  committed
  879b8b3

  Copy full SHA for 879b8b3

• revert back flagFloatingIps

  aloftus23

  committed
  f72f521

  Copy full SHA for f72f521

Commits on Oct 10, 2024

• Allow regionAdmins to approve their users

  aloftus23

  committed
  324186c

  Copy full SHA for 324186c

• Fix flag floating ips

  aloftus23

  committed
  21fad1d

  Copy full SHA for 21fad1d

Commits on Oct 17, 2024

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  f2371fa

  Copy full SHA for f2371fa

• Update app.ts and lambda_logger

  aloftus23

  committed
  f7dc1ec

  Copy full SHA for f7dc1ec

• Unrevert Sprint 13 solutions

  aloftus23

  committed
  4c96fa1

  Copy full SHA for 4c96fa1

Commits on Oct 21, 2024

• Fix filename should be logs

  aloftus23

  committed
  a2a9d7e

  Copy full SHA for a2a9d7e

• Fix stats for material views - revert to last solution

  aloftus23

  committed
  ee45812

  Copy full SHA for ee45812

• re-add the logHeader calls

  aloftus23

  committed
  b06ccb6

  Copy full SHA for b06ccb6

Commits on Nov 18, 2024

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  7c5c248

  Copy full SHA for 7c5c248

• Revert "Remove ReadySetCyber (RSC) from TypeScript Backend. (#723)"

  Show description for 7dd81db
  aloftus23

  committed
  7dd81db

  Copy full SHA for 7dd81db

Commits on Dec 5, 2024

• Revert "Revert "Remove ReadySetCyber (RSC) from TypeScript Backend. (#723)""

  Show description for 90be9cf
  aloftus23

  committed
  90be9cf

  Copy full SHA for 90be9cf

• Merge branch 'develop' into 20-merge-lz-infra

  aloftus23

  committed
  ed31b7e

  Copy full SHA for ed31b7e

Commits on Dec 10, 2024

• Update frontend package-lock

  aloftus23

  committed
  372c221

  Copy full SHA for 372c221