Skip to content

Commit

Permalink
Merge pull request #249 from 18F/stages/rc-2021-08-27
Browse files Browse the repository at this point in the history
Deploy RC 23 to Prod
  • Loading branch information
mitchellhenke committed Aug 30, 2021
2 parents eedb3aa + cba6011 commit fbe05f3
Show file tree
Hide file tree
Showing 14 changed files with 384 additions and 79 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build:
docker:
# Specify the Ruby version you desire here
- image: circleci/ruby:2.6-node-browsers
- image: circleci/ruby:2.7-node-browsers
environment:
RAILS_ENV: test
CC_TEST_REPORTER_ID: c88a6f4af1fbf80e0fc9a5593ebff124b2f940645b1eacb5adb681522bbf650e
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
build-release-container:
working_directory: ~/identity-pki
docker:
- image: circleci/ruby:2.6
- image: circleci/ruby:2.7
steps:
- checkout
- setup_remote_docker
Expand All @@ -84,7 +84,7 @@ jobs:
check-expiring-certs-config:
docker:
# Specify the Ruby version you desire here
- image: circleci/ruby:2.6-node-browsers
- image: circleci/ruby:2.7-node-browsers
environment:
RAILS_ENV: test
CC_TEST_REPORTER_ID: c88a6f4af1fbf80e0fc9a5593ebff124b2f940645b1eacb5adb681522bbf650e
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6
2.7
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source 'https://rubygems.org'
git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }

ruby '~> 2.6.5'
ruby '~> 2.7.3'

gem 'rails', '~> 6.1.3'
gem 'rails', '~> 6.1.4'

gem 'activerecord-import', '>= 1.0.2'
gem 'aws-sdk', require: false
Expand Down Expand Up @@ -43,7 +43,6 @@ end

group :test do
gem 'axe-matchers', '~> 1.3.4'
gem 'codeclimate-test-reporter', '>= 1.0.9', require: false
gem 'database_cleaner'
gem 'factory_bot_rails', '>= 5.2.0'
gem 'fakefs', require: 'fakefs/safe'
Expand Down
141 changes: 69 additions & 72 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,62 +19,62 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.3.2)
actionpack (= 6.1.3.2)
activesupport (= 6.1.3.2)
actioncable (6.1.4.1)
actionpack (= 6.1.4.1)
activesupport (= 6.1.4.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
actionmailbox (6.1.4.1)
actionpack (= 6.1.4.1)
activejob (= 6.1.4.1)
activerecord (= 6.1.4.1)
activestorage (= 6.1.4.1)
activesupport (= 6.1.4.1)
mail (>= 2.7.1)
actionmailer (6.1.3.2)
actionpack (= 6.1.3.2)
actionview (= 6.1.3.2)
activejob (= 6.1.3.2)
activesupport (= 6.1.3.2)
actionmailer (6.1.4.1)
actionpack (= 6.1.4.1)
actionview (= 6.1.4.1)
activejob (= 6.1.4.1)
activesupport (= 6.1.4.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.3.2)
actionview (= 6.1.3.2)
activesupport (= 6.1.3.2)
actionpack (6.1.4.1)
actionview (= 6.1.4.1)
activesupport (= 6.1.4.1)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.3.2)
actionpack (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
actiontext (6.1.4.1)
actionpack (= 6.1.4.1)
activerecord (= 6.1.4.1)
activestorage (= 6.1.4.1)
activesupport (= 6.1.4.1)
nokogiri (>= 1.8.5)
actionview (6.1.3.2)
activesupport (= 6.1.3.2)
actionview (6.1.4.1)
activesupport (= 6.1.4.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.3.2)
activesupport (= 6.1.3.2)
activejob (6.1.4.1)
activesupport (= 6.1.4.1)
globalid (>= 0.3.6)
activemodel (6.1.3.2)
activesupport (= 6.1.3.2)
activerecord (6.1.3.2)
activemodel (= 6.1.3.2)
activesupport (= 6.1.3.2)
activemodel (6.1.4.1)
activesupport (= 6.1.4.1)
activerecord (6.1.4.1)
activemodel (= 6.1.4.1)
activesupport (= 6.1.4.1)
activerecord-import (1.0.8)
activerecord (>= 3.2)
activestorage (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
activerecord (= 6.1.3.2)
activesupport (= 6.1.3.2)
activestorage (6.1.4.1)
actionpack (= 6.1.4.1)
activejob (= 6.1.4.1)
activerecord (= 6.1.4.1)
activesupport (= 6.1.4.1)
marcel (~> 1.0.0)
mini_mime (~> 1.0.2)
activesupport (6.1.3.2)
mini_mime (>= 1.1.0)
activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -1068,13 +1068,11 @@ GEM
byebug (11.1.3)
childprocess (4.0.0)
choice (0.2.0)
codeclimate-test-reporter (1.0.9)
simplecov (<= 0.13)
coderay (1.1.3)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
colorize (0.8.1)
concurrent-ruby (1.1.8)
concurrent-ruby (1.1.9)
crack (0.4.4)
crass (1.0.6)
daemons (1.3.1)
Expand Down Expand Up @@ -1113,8 +1111,8 @@ GEM
formatador (0.2.5)
get_process_mem (0.2.7)
ffi (~> 1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
globalid (0.5.2)
activesupport (>= 5.0)
guard (2.16.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
Expand Down Expand Up @@ -1149,7 +1147,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.9.1)
loofah (2.12.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.2.8)
Expand All @@ -1160,14 +1158,14 @@ GEM
method_source (1.0.0)
mini_cache (1.1.0)
mini_histogram (0.3.1)
mini_mime (1.0.3)
mini_portile2 (2.5.1)
mini_mime (1.1.1)
mini_portile2 (2.6.1)
minitest (5.14.4)
nenv (0.3.0)
newrelic_rpm (6.13.1)
nio4r (2.5.7)
nokogiri (1.11.4)
mini_portile2 (~> 2.5.0)
nio4r (2.5.8)
nokogiri (1.12.3)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
Expand Down Expand Up @@ -1196,20 +1194,20 @@ GEM
rack (>= 1.2.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.1.3.2)
actioncable (= 6.1.3.2)
actionmailbox (= 6.1.3.2)
actionmailer (= 6.1.3.2)
actionpack (= 6.1.3.2)
actiontext (= 6.1.3.2)
actionview (= 6.1.3.2)
activejob (= 6.1.3.2)
activemodel (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
rails (6.1.4.1)
actioncable (= 6.1.4.1)
actionmailbox (= 6.1.4.1)
actionmailer (= 6.1.4.1)
actionpack (= 6.1.4.1)
actiontext (= 6.1.4.1)
actionview (= 6.1.4.1)
activejob (= 6.1.4.1)
activemodel (= 6.1.4.1)
activerecord (= 6.1.4.1)
activestorage (= 6.1.4.1)
activesupport (= 6.1.4.1)
bundler (>= 1.15.0)
railties (= 6.1.3.2)
railties (= 6.1.4.1)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -1223,16 +1221,16 @@ GEM
activesupport (>= 4.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.3.0)
rails-html-sanitizer (1.4.1)
loofah (~> 2.3)
railties (6.1.3.2)
actionpack (= 6.1.3.2)
activesupport (= 6.1.3.2)
railties (6.1.4.1)
actionpack (= 6.1.4.1)
activesupport (= 6.1.4.1)
method_source
rake (>= 0.8.7)
rake (>= 0.13)
thor (~> 1.0)
rainbow (3.0.0)
rake (13.0.3)
rake (13.0.6)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -1324,7 +1322,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.3)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.4.2)
Expand All @@ -1343,7 +1341,6 @@ DEPENDENCIES
brakeman
bullet (>= 6.0.2)
bummr
codeclimate-test-reporter (>= 1.0.9)
database_cleaner
derailed (>= 0.1.0)
factory_bot_rails (>= 5.2.0)
Expand All @@ -1361,7 +1358,7 @@ DEPENDENCIES
pry-rails
puma (~> 4.3)
rack-mini-profiler (>= 1.0.2)
rails (~> 6.1.3)
rails (~> 6.1.4)
rails-controller-testing (>= 1.0.4)
rails-erd (>= 1.6.0)
redacted_struct (~> 1.0)
Expand All @@ -1378,7 +1375,7 @@ DEPENDENCIES
zonebie

RUBY VERSION
ruby 2.6.5p114
ruby 2.7.3p183

BUNDLED WITH
2.2.16
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Subject: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DOD EMAIL CA-62
Issuer: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DoD Root CA 3
-----BEGIN CERTIFICATE-----
MIIEvDCCA6SgAwIBAgICBV0wDQYJKoZIhvcNAQELBQAwWzELMAkGA1UEBhMCVVMx
GDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMQwwCgYDVQQL
EwNQS0kxFjAUBgNVBAMTDURvRCBSb290IENBIDMwHhcNMjEwNjA4MTM1MTM4WhcN
MjcwNjA5MTM1MTM4WjBdMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zl
cm5tZW50MQwwCgYDVQQLEwNEb0QxDDAKBgNVBAsTA1BLSTEYMBYGA1UEAxMPRE9E
IEVNQUlMIENBLTYyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtelD
jabqJkL0EnJlJ1CTLkrQoDs1TiB164u5Wi5fj300mgkDxFF9hXxwRcoCHfAS/Br3
oHAm7sTowUidd5PugwFo9moZYhsl8k25s2oYmyKOkDVq+8hfNjUvatTs1HqF7W8A
Aar1qOVeTM5lJKJg+/3svf9fb3ZUl2LjJF+McRT0c7wd2WlsCVoTUu7kbCNS9B9+
VlDXRrR7WAK3fLCXNcI2RVoDfFFjtdekqV+otL+IMPxCQwORnOklx2GBnM3wldq5
U8hNw+ebpp20aRv71gK4fZ4AqKPZJ/HLZmB/tzxXubUvrmpswyjy/T3wJXVK0I1N
/ytrQE2DNYrBeNV2zQIDAQABo4IBhjCCAYIwHwYDVR0jBBgwFoAUbIqUonexgHId
gXoWqvLczmbuRcAwHQYDVR0OBBYEFM3F5uPkJReXcLqqk+K5vkGjkivnMA4GA1Ud
DwEB/wQEAwIBhjBnBgNVHSAEYDBeMAsGCWCGSAFlAgELJDALBglghkgBZQIBCycw
CwYJYIZIAWUCAQsqMAsGCWCGSAFlAgELOzAMBgpghkgBZQMCAQMNMAwGCmCGSAFl
AwIBAxEwDAYKYIZIAWUDAgEDJzASBgNVHRMBAf8ECDAGAQH/AgEAMAwGA1UdJAQF
MAOAAQAwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5kaXNhLm1pbC9jcmwv
RE9EUk9PVENBMy5jcmwwbAYIKwYBBQUHAQEEYDBeMDoGCCsGAQUFBzAChi5odHRw
Oi8vY3JsLmRpc2EubWlsL2lzc3VlZHRvL0RPRFJPT1RDQTNfSVQucDdjMCAGCCsG
AQUFBzABhhRodHRwOi8vb2NzcC5kaXNhLm1pbDANBgkqhkiG9w0BAQsFAAOCAQEA
SF8g2dpY+b+ozXWCtP7fjnL+Tcukwj4Wbc+SrNL2I7DUUayNqwuOLj4a4I7sDL9F
lrFul69WuV8PiFBbKTV913PpkFFP1NhXDdBkcBFrXnt0UMAU9yvaUCyTcr7ikUEH
wVEeE70FQy7Dx23aZf9XSOzcMuSmIo2N8P2OdU3VdKLhOabdR2JlvEMqXEihTn81
ABzGae0tDXVsmnykPUIClsLjHNjUBSqF76TuZv5foLJAKOo1xeDrjRajawjBsN0M
nZPRC6X+eodQgzNuTpcscspsVuBnOsInkBZd4RXm9PuPjSH77hB8an7bPrWaufE+
e45aFpkQzFArjrFNz/R/4Q==
-----END CERTIFICATE-----
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Subject: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DOD EMAIL CA-63
Issuer: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DoD Root CA 3
-----BEGIN CERTIFICATE-----
MIIEvDCCA6SgAwIBAgICBUgwDQYJKoZIhvcNAQELBQAwWzELMAkGA1UEBhMCVVMx
GDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMQwwCgYDVQQL
EwNQS0kxFjAUBgNVBAMTDURvRCBSb290IENBIDMwHhcNMjEwNjAxMTQwMjIxWhcN
MjcwNjAyMTQwMjIxWjBdMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zl
cm5tZW50MQwwCgYDVQQLEwNEb0QxDDAKBgNVBAsTA1BLSTEYMBYGA1UEAxMPRE9E
IEVNQUlMIENBLTYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7GFm
nf9Dhw3p6lGHhZTUTr9rNWyihovYscqV6qFF6floDLD70Wizru84tvMGosp1PkWt
KU/ObjvqQjhjdvppaDHYxmUxCHIt0lGhnmkfzTbtjLANTG+Lm7PArrW6osRGsMV7
jRhgLStj+52QgCkQNAqbqTB4o3OQSQd6Akn9YrWpbuVFl/ZY0B/4By/Xg0qvd90d
EgwKw9FPe1O/KRyjea0zow6mDqeS7ZdwSgbAHfbQNahk6QzYRAY/J0pUQ4TDAgFe
8tCHL3h4JdwAdBP5zL2sfE9FoZV4xbjk6eP/S7riQw5aXJmsZHLqFX/wSUVCaPTk
iGan8Dpo5b28VE0GjwIDAQABo4IBhjCCAYIwHwYDVR0jBBgwFoAUbIqUonexgHId
gXoWqvLczmbuRcAwHQYDVR0OBBYEFE0xrVHWTld+Z2kzJQN+ximl3brzMA4GA1Ud
DwEB/wQEAwIBhjBnBgNVHSAEYDBeMAsGCWCGSAFlAgELJDALBglghkgBZQIBCycw
CwYJYIZIAWUCAQsqMAsGCWCGSAFlAgELOzAMBgpghkgBZQMCAQMNMAwGCmCGSAFl
AwIBAxEwDAYKYIZIAWUDAgEDJzASBgNVHRMBAf8ECDAGAQH/AgEAMAwGA1UdJAQF
MAOAAQAwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5kaXNhLm1pbC9jcmwv
RE9EUk9PVENBMy5jcmwwbAYIKwYBBQUHAQEEYDBeMDoGCCsGAQUFBzAChi5odHRw
Oi8vY3JsLmRpc2EubWlsL2lzc3VlZHRvL0RPRFJPT1RDQTNfSVQucDdjMCAGCCsG
AQUFBzABhhRodHRwOi8vb2NzcC5kaXNhLm1pbDANBgkqhkiG9w0BAQsFAAOCAQEA
QS+92B7pNsK55GuIAZV+h42MR0dTfiidbgldvXxPtLUBh2Ab0EqRbboXw4s/mxDG
85vN9Qke4/v30MtHa9i9IwyzFDq5GfCC7ygi2RKOGShmVxE5gBrzF8Ok0O4BS8i5
8+Q7wJywx5pC7TgrtziP0zMKw7QVYHYqeRsu0lTLIEu76HAWRdZwVPcz3Kph0bRH
zFrJ2ZIDfVzn1EG8qosPWN2vzBE633eBfm9VWobMR4Uxs7ZiFzJFRDy/ai5DGJ1j
fxVglI8q1YD4UU0/yaeMVgaGwoCx9sb+q5XCXEn9MV2dbmVf4D+jVm12xYYd146M
G6vK43wgw7eLa6LNYNCF1g==
-----END CERTIFICATE-----
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Subject: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DOD EMAIL CA-64
Issuer: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DoD Root CA 3
-----BEGIN CERTIFICATE-----
MIIEvDCCA6SgAwIBAgICBUkwDQYJKoZIhvcNAQELBQAwWzELMAkGA1UEBhMCVVMx
GDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMQwwCgYDVQQL
EwNQS0kxFjAUBgNVBAMTDURvRCBSb290IENBIDMwHhcNMjEwNjAxMTQwNTE5WhcN
MjcwNjAyMTQwNTE5WjBdMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zl
cm5tZW50MQwwCgYDVQQLEwNEb0QxDDAKBgNVBAsTA1BLSTEYMBYGA1UEAxMPRE9E
IEVNQUlMIENBLTY0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz084
CMrLDnhLu2b3yBkRp4B03zV4O7pAVqDz8Q4zOWehm6kJs60Q2dXXzuXk0Jx70aFd
k4I8k84SSfCzvMhSz3SvrTK14yjCFVhlVgyQcST5WvnXwMMH4npGg/ZG8eNYxdYD
+JLLNeZPlZEdGwMHq9Ue6LuNVQP3d2FMRJahUZ0eP786zBeI8bebSG/7WBZSz/RI
2fwLg9Rv9aKjmy/j5ZZ3pi7GcezdVgcClNqhrFg96t46GXM6R7i8rgFEECXj9NiW
JllqveM0nV8Ty5q8yP5M52Y0Eyo9Xy7EPa5fA4v7TbM6dYCny4SYUTG+8qDx39vR
7RF5IoRrXniIyWWsuQIDAQABo4IBhjCCAYIwHwYDVR0jBBgwFoAUbIqUonexgHId
gXoWqvLczmbuRcAwHQYDVR0OBBYEFIuQfSHrvBoVe8KwTn5zUcgOtty2MA4GA1Ud
DwEB/wQEAwIBhjBnBgNVHSAEYDBeMAsGCWCGSAFlAgELJDALBglghkgBZQIBCycw
CwYJYIZIAWUCAQsqMAsGCWCGSAFlAgELOzAMBgpghkgBZQMCAQMNMAwGCmCGSAFl
AwIBAxEwDAYKYIZIAWUDAgEDJzASBgNVHRMBAf8ECDAGAQH/AgEAMAwGA1UdJAQF
MAOAAQAwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5kaXNhLm1pbC9jcmwv
RE9EUk9PVENBMy5jcmwwbAYIKwYBBQUHAQEEYDBeMDoGCCsGAQUFBzAChi5odHRw
Oi8vY3JsLmRpc2EubWlsL2lzc3VlZHRvL0RPRFJPT1RDQTNfSVQucDdjMCAGCCsG
AQUFBzABhhRodHRwOi8vb2NzcC5kaXNhLm1pbDANBgkqhkiG9w0BAQsFAAOCAQEA
ixpW3FOdC8mBhMVhIVrMeIDgMzDHtI/0TVsfFUwASajibCl51loMCvy9MN0zlWKF
/ae4yzmnzk+TT+KCksF2iClCmuk5Ikz1OUOJvtP4osZEo8gHsvM9IOYc+pGqCCwj
AN1AKunjJzC48fe1I03Y6B2ts497pia3Tn/Dkkg0MKICdJuT9+oFSrqHu1tnuoti
VBMY6Lk4tLqfRhWIUDmhkEa0GLjvmx3m6kytA+SNmI0kUHFW1FeZvNBgnjrEY2SM
HlW1pTJsObYjfiicDIPuqJu633MKEaQgQRukOLEfV0CSEt7PLaVcD/JLjuHGttwd
0019mApk8G9z4Le8G22i4w==
-----END CERTIFICATE-----
Loading

0 comments on commit fbe05f3

Please sign in to comment.