[arvados] updated: 2.1.0-2804-g2e03d03bc

git repository hosting git at public.arvados.org
Mon Jul 25 14:56:47 UTC 2022


Summary of changes:
 apps/workbench/Gemfile.lock                        |  82 +--
 .../workbench/app/views/users/_show_admin.html.erb |   4 +-
 build/run-build-packages-one-target.sh             |   1 +
 build/run-build-packages.sh                        |   2 +
 cmd/arvados-client/cmd.go                          |   1 +
 cmd/arvados-client/sudo.go                         |  48 ++
 cmd/arvados-package/fpm.go                         |  42 +-
 cmd/arvados-package/install.go                     |   6 +-
 cmd/arvados-server/cmd.go                          |  18 +-
 doc/_config.yml                                    |   2 +-
 doc/admin/config-urls.html.textile.liquid          |  20 +-
 doc/api/keep-s3.html.textile.liquid                |  18 +
 doc/install/automatic.html.textile.liquid          |  72 ++-
 ...ados-sync-external-sources.html.textile.liquid} |  53 +-
 lib/boot/cert.go                                   | 217 +++++++-
 lib/boot/cmd.go                                    |   8 +-
 lib/boot/nginx.go                                  |  20 +-
 lib/boot/passenger.go                              |   7 +-
 lib/boot/service.go                                |  12 +-
 lib/boot/supervisor.go                             |  48 +-
 lib/cli/external.go                                |  17 +-
 lib/config/cmd_test.go                             |   2 +-
 lib/config/config.default.yml                      |  99 +++-
 lib/controller/handler.go                          |   7 -
 lib/controller/handler_test.go                     |  12 +-
 lib/controller/integration_test.go                 | 103 ++--
 lib/crunchrun/crunchrun.go                         |  46 +-
 lib/crunchrun/integration_test.go                  |   7 +-
 lib/diagnostics/cmd.go                             |  48 +-
 lib/install/arvados.service                        |   5 +-
 lib/install/deps.go                                | 148 ++++--
 lib/install/init.go                                | 369 ++++++++++++--
 lib/service/cmd.go                                 |  85 +++-
 lib/service/cmd_test.go                            | 122 +++++
 lib/service/tls.go                                 |  70 ++-
 sdk/go/arvados/config.go                           |   4 +
 sdk/go/arvados/fs_base.go                          |  15 +-
 sdk/go/arvados/fs_collection.go                    |   1 +
 sdk/go/arvados/fs_deferred.go                      |   1 +
 sdk/go/arvados/fs_project.go                       |  11 +-
 sdk/go/arvados/fs_site.go                          |  21 +-
 sdk/go/arvados/fs_users.go                         |   4 +-
 sdk/go/httpserver/inspect.go                       | 133 +++++
 sdk/go/httpserver/inspect_test.go                  |  98 ++++
 sdk/go/httpserver/logger.go                        |   6 +
 sdk/go/httpserver/request_limiter_test.go          |   6 +-
 .../client/api/client/KeepWebApiClient.java        |  13 +
 .../client/api/client/ProgressListener.java        |   2 +-
 .../org/arvados/client/logic/keep/KeepClient.java  |   4 +-
 .../client/api/client/KeepWebApiClientTest.java    |  39 ++
 .../api/client/keep-client-upload-response.json    |   1 +
 sdk/python/tests/nginx.conf                        |  20 +-
 sdk/python/tests/run_test_server.py                |   1 +
 services/api/Gemfile.lock                          |  82 +--
 .../api/app/controllers/database_controller.rb     |  17 +-
 services/api/app/models/user.rb                    |  17 +
 services/api/test/fixtures/users.yml               |  14 +-
 services/api/test/integration/users_test.rb        |  56 ++
 services/keep-web/handler.go                       |  38 +-
 services/keep-web/handler_test.go                  | 113 ++++-
 services/keep-web/s3.go                            |  72 +++
 services/keep-web/s3_test.go                       | 102 +++-
 services/login-sync/bin/arvados-login-sync         |  16 +-
 .../multi_host/aws/pillars/arvados.sls             |   2 +-
 .../aws/pillars/nginx_webshell_configuration.sls   |   2 +-
 .../multi_host/aws/pillars/postgresql.sls          |   2 +-
 .../aws/states/shell_cron_add_login_sync.sls       |   7 +
 .../multiple_hostnames/pillars/nginx_passenger.sls |   2 +-
 .../multiple_hostnames/pillars/postgresql.sls      |   2 +-
 .../multiple_hostnames/states/host_entries.sls     |   2 +-
 .../single_hostname/pillars/nginx_passenger.sls    |   2 +-
 .../single_hostname/pillars/postgresql.sls         |   2 +-
 .../single_hostname/states/host_entries.sls        |   2 +-
 tools/salt-install/installer.sh                    | 257 ++++++++++
 .../local.params.example.multiple_hosts            |  19 +-
 ...l.params.example.single_host_multiple_hostnames |  11 +
 ...ocal.params.example.single_host_single_hostname |  11 +
 tools/salt-install/provision.sh                    |   4 +-
 tools/sync-groups/sync-groups.go                   |   4 +-
 tools/sync-users/.gitignore                        |   1 +
 tools/sync-users/sync-users.go                     | 556 ++++++++++++++++++++
 tools/sync-users/sync-users_test.go                | 561 +++++++++++++++++++++
 82 files changed, 3707 insertions(+), 470 deletions(-)
 create mode 100644 cmd/arvados-client/sudo.go
 rename doc/user/topics/{arvados-sync-groups.html.textile.liquid => arvados-sync-external-sources.html.textile.liquid} (51%)
 create mode 100644 sdk/go/httpserver/inspect.go
 create mode 100644 sdk/go/httpserver/inspect_test.go
 create mode 100644 sdk/java-v2/src/test/java/org/arvados/client/api/client/KeepWebApiClientTest.java
 create mode 100644 sdk/java-v2/src/test/resources/org/arvados/client/api/client/keep-client-upload-response.json
 create mode 100755 tools/salt-install/installer.sh
 create mode 100644 tools/sync-users/.gitignore
 create mode 100644 tools/sync-users/sync-users.go
 create mode 100644 tools/sync-users/sync-users_test.go

       via  2e03d03bc55b5a612c2bf04d878a72f2ee420d99 (commit)
       via  46aadf6a64881e932adb4c54cb1a8c4b22e84d67 (commit)
       via  61d3aed1cd0286c7928167a84267c225938a37ec (commit)
       via  736c58d66deda35079ad8b64df02ee0ef57232f0 (commit)
       via  e995446d93c8109d7894010d57c4cc32ae04a459 (commit)
       via  6dfa03b4c6211d265e15a4982831edd59eadf3af (commit)
       via  6501c300ebaa01552e17619cc1c89ee38f7398a7 (commit)
       via  420e857f8e8ac75beca258fa72b9edac680500cd (commit)
       via  e186a3539c02602333bb4c98690ab3b7527decc4 (commit)
       via  c966970d64c21d7adaf1c3c8b737aa9e7c166f0e (commit)
       via  8b2af30849edeab5ad8ebc6b51eaec39e5fdd81a (commit)
       via  3c87fb14f48b78d30142f12c8cb855dba92c926d (commit)
       via  d15f485909cf84aeda62c0a843f384cb218e0125 (commit)
       via  7a58458d4a6cedc6bae454b351f1480c73df1523 (commit)
       via  a2d23c038780134c812249e74d9e6d1b7cad69b6 (commit)
       via  8bba581238a7a9a1e4e1965320999de448cc3b7a (commit)
       via  a4fc0df348d192c2b147d4964c0dfa4079e2181f (commit)
       via  84ef8710cb1c020688ff210bca965051eee9e09e (commit)
       via  d0a076cc20d4e67c5695268b1dbf5e6862eab5b0 (commit)
       via  08b07a1a27a19eecd70a09cf4b47727224a9d36d (commit)
       via  61289799493bef68bf502ae07bd2cba6e161e7f3 (commit)
       via  748ee07068ed64fa2e12901ce43f548bd4ff213a (commit)
       via  89a3d1b2fedbc6cea8dfc09c81dcea05ff22bcb5 (commit)
       via  3218db7a7af5c34032d28ba03bffa1684f52897e (commit)
       via  2f0c775a9e1ab8c3abdd94c854326fab771c4b5e (commit)
       via  53effa806b73a1c728fba9160b23000c8f7cc5e0 (commit)
       via  52fd35cf046bbb1b20a7b884f485fc65de71a86a (commit)
       via  fa502f7616688af482e614e1a30cd6dd341e2dec (commit)
       via  e16ee88755436818cbed44dabb784d1d3254d469 (commit)
       via  e07a9786ff1fa6e53f4429e301ea866e886eb649 (commit)
       via  70d97b98ddf977505069795ef08236fb439b18e1 (commit)
       via  0873efcdab481d9f77f477f4adbf56ee3380f2f9 (commit)
       via  e9b55fb61c952360b25e008a39630c7ae1f687b6 (commit)
       via  4a9acc11eaba55a152851256d19c8fdad3b9f863 (commit)
       via  249411c97c0f3740c66e4f3260481262b89b23dc (commit)
       via  c6d1af0fd763c117b65defd1f19848c74f83b03b (commit)
       via  f690cb6af6d36a5105a846dd69e0fd624b4e7f0e (commit)
       via  37b0b06bd0ed9250f3221ad50ef6a83e3a342a17 (commit)
       via  12ae5bb1f2169c130693e02f6cd745e1a80e4cab (commit)
       via  ba1114ac181b6648a798385058e6c18d92ec56ef (commit)
       via  63a0142d147eb052831c4d401a8c84e95f7ce97f (commit)
       via  b1011cf8f4ef91fa16365fbe3b386134192f3813 (commit)
       via  3c9a22bf72ea789d14cc19c11a5518b8ae3ee5a8 (commit)
       via  4a7e623df65e1ddf3552cdb97bbbcaef450872dd (commit)
       via  f159610ed02196b33fa30e1c3bba45fa947d48a9 (commit)
       via  6e004a4169a781ef9e288bd94f585a5eb3ca942c (commit)
       via  033402319af1198d44e13e2452d2b150b3157900 (commit)
       via  86beb5fc2d508cef8e38ad0b4db8e14d68556dbb (commit)
       via  3325e3c0aca3dcf51dfc72b63c7d077c6b6e5017 (commit)
       via  07dee94c0521e18589feb43fa2969fc2c179f866 (commit)
       via  71c950e0fd83ec868339dcf9ed879bf4ea44107e (commit)
       via  9dfd25989a0b93f20936812d99bf453dd9c079f2 (commit)
       via  926a731c492726b2590993765f1b3d383e557fa5 (commit)
       via  e8e1df081b2da155ffc3c9a0a012f91a480d1eea (commit)
       via  d0353c5236ead26317200cc5fdd5cee31a2b261b (commit)
       via  e12c1fed6336048d6ab854bbfab95eccf7c1b372 (commit)
       via  1533034e5ef86ce3f3696a42d390c21bd546dab6 (commit)
       via  4e8873ba05e44e49284e05e6fdc0913c525269b3 (commit)
       via  41a378b99c8c4411a66c19e878b7535c67de2ba3 (commit)
       via  20d7bfd30b4c890246c7ad72d6c96f93417f12ee (commit)
       via  831540fd5eedb6226996b5c72a86f2dba64cb196 (commit)
       via  13736aa4f0feea65abce2aedc7c4ca0d18e01061 (commit)
       via  df17ea1c927da5ac2955e9cc83b6d7ab88085fdb (commit)
       via  039d253a76771d50cee07503cb08494b6b7e2461 (commit)
       via  01b48f7ba1ed76df4277145548fac313a3aca7cd (commit)
       via  ef833210fd7400727e01c97551ab0e645773d3fb (commit)
       via  6a5c119c5deba34d4b61af36edb5aa3a5dc1c70b (commit)
       via  c294528f250d4eea64ee40183598f40f32e9e796 (commit)
       via  0fa894e23fb824ea9b5222d808f3c205651d3170 (commit)
       via  907d851d91a5ba8071e13f9ea4bf3608d7fe5723 (commit)
       via  1830291389ed69b950f2f94fbb9155c63e6b4679 (commit)
       via  cd9e72bd95b32203231f6ccc96ddce9325b30a95 (commit)
       via  15e759482006d9f689f8afeb40a97e0f15dfe278 (commit)
       via  da532b4d0a1939bbfa063beaffc53582aa3907d6 (commit)
       via  c592128fda794f2679a117a881c2f7d86ae091e0 (commit)
       via  0ec937fd42be7f1d3757eba48fa944627dfe591d (commit)
       via  bc481119881ed9558f05fb86673b39dae0a0428a (commit)
       via  2d29045a1b392251b777639634e527abfd8b06e2 (commit)
       via  4c24ce559f6ff72b2aa621e71c72625a16740bee (commit)
       via  6bcc2cf0dea668fd5c00af9f859e0c4327fbfa14 (commit)
       via  48495e8ed3c15aefa94561ecf7caedc6ad716514 (commit)
       via  36f730574cf6d5f720656de6a102963af5e15cab (commit)
       via  8fdafb5686f03e5f687e4c680be817d024bdcb6b (commit)
       via  1e8ea2315684b951e6d4bde99b98a5b4108f5e4e (commit)
       via  100710416212448cf653a260f9a67933a30656cf (commit)
       via  e7f9b76848ba874c777a950fac1b13a88ce485dd (commit)
       via  016474590b8995d7651aa05bb49d8930f0b1701b (commit)
       via  e158fecc41b58f357345ac3114592a429218dc3a (commit)
       via  490aaa38ccb260f94e2ee25e7c6a50c982da35ae (commit)
       via  607033c33f2001c194fe8c68d0dc17e4bde849da (commit)
       via  bd5f21b6a567248d05126d78bab091555764a052 (commit)
       via  de4f7a1ed61ed17a961732668a2c5957130d4740 (commit)
       via  1dadff7a6d839e3a4e1ebf4d2c91e4144a036f35 (commit)
       via  46f0c0faf4f032697d59c2d663018ae67d1059d4 (commit)
       via  51fd368253a0b61c58f62bea829446109bf6af3a (commit)
       via  005a2e1472484182eec807fce9fa1137bd607c5e (commit)
       via  c6d8eb619ad9dee27793c068f4e178f2c932906b (commit)
       via  bdcf09e34f8eec88e1e326094ac60b5d484844e1 (commit)
       via  51f6ce76c7b1e0a297f8265122c2deef436a4065 (commit)
       via  9ae866579b9e62ac11817b8053aaae74be7ea1cf (commit)
       via  b09d1b51bbaa0a7709166187bb007683053205ed (commit)
       via  2361a96130524ee57b0e1d652d560e8e31993b04 (commit)
       via  e6d97ad638edb8aef6b558744d5de4c0ae6e5199 (commit)
       via  6b4c21f5c898fdccc66bab6913e8fd2874dfc15e (commit)
       via  8e69a90b47486ea39d89b9209e327a6bb475debb (commit)
       via  e47293395f0908a708680df773780ce418b48de9 (commit)
       via  8b3dd08ed1d43121bd92452c7cb0504098eb5887 (commit)
       via  49ce9a4b07da6ae0da25e19a34e91b4664d8b2a5 (commit)
       via  f1b67a590f30b5f8824b14f7b49520106a13bb29 (commit)
       via  5722e7f91d3ab4df898dec0d301c0653ac7995b3 (commit)
       via  6b77f5f193b9c7e931d2e0b0712c1b27cd547fc8 (commit)
       via  469521bb7ea65a68f04a7595d3b6b10264026db6 (commit)
       via  795a29f42c333ee369e852977e7018fe4c5c94ae (commit)
       via  6eb56e41997fe179d6aae140700c307a09d5b703 (commit)
       via  4aaa7415151412b97b706a442d0487c15b39c495 (commit)
       via  8f69a16eb56dfea60b4abafb4e73a45d19c01476 (commit)
       via  a229aa70a28a4f46fb9ba71bf038655634bcf2d4 (commit)
       via  f699425ce9bd7b5055192e81de31cc10609ba41d (commit)
       via  470641e02dc18aeba8506bd3479511db13492e25 (commit)
       via  4e355db55f12be1944a1e21b9f386e6bc101dcde (commit)
       via  e4cbfb51207a7b3430a9cad983b41527bcf4cf5e (commit)
       via  ffb6a2fbc2552b38dd27b216c9db6539e81cef56 (commit)
       via  11f4d90ff07de3557a86d78cb8623ad059633d04 (commit)
       via  2df5de69d74ab1fbf1fbcec23d392193522b0364 (commit)
       via  f3b0dd8d793994d2661cc416cb4136e85883874e (commit)
       via  2efd88cf64130bb0ebb0549d30053b85baaae2f9 (commit)
       via  0fccbb05425c59e5b2c13954dcb73ec79043f879 (commit)
       via  9ce1f09357f146cefe582690b1468d032866b3ca (commit)
       via  3b470b3778a99c6148f407f25a6ef22bd4bc9a24 (commit)
       via  5fe15b9011228668b4b95f2416a87c376479822a (commit)
       via  d70538d2019716a15159f85079d1174cc84e8407 (commit)
       via  53d1c0d6e9986ae9d0e28fd872cde882284662af (commit)
       via  bf261328ff15d3f9cf5109bfcc505e12f78481fc (commit)
       via  4090574822afd6a7b48ccd277ba84c3cc6244e71 (commit)
       via  093ec98e4a065acfc537ea22c08c337c115fe273 (commit)
       via  09e7068b4b1e0c046eb52dadce4d5d7de813fff2 (commit)
       via  8e26a9aeede967030e10cb93b01aad6bd519b484 (commit)
       via  e39adbe28e6ada009b086a53bc9e4187b824fd0d (commit)
       via  713f0a0a96840404115b57ae92b8a2f2a554383e (commit)
       via  3a7b7f2254e57dc8f273cc468ec9622b759905bd (commit)
       via  e59273e06c41fa1532ab887f62695a2bd6d0e284 (commit)
       via  c47e500a8143b1354624a962eae7f8fc016ba72f (commit)
       via  6d154157c70aaf4a5856b170a1b2eb9395348cc1 (commit)
       via  fc3e2c30b85c138fdbdf440f4f29f5f710de2814 (commit)
       via  7aecff0797f9d282587544b356b105c05f13da21 (commit)
       via  5c32f7ed756e32bb3fa03182730f9fad8aab9897 (commit)
       via  9b9da21b7bcdb593ed0b06b693add9fdb01d3437 (commit)
       via  7c14fcc9171f6fe707a9f17dc44357f00ff51333 (commit)
       via  623bd0b69f9ad3fe3889acc463955630946275d2 (commit)
       via  722fbc71928e7fc6b91eb101788b51c2bb9577eb (commit)
       via  04666c2304ea7700243756cfb0278cc139e969ce (commit)
       via  ba86d71949972435ac3ac0ad54cb34a237970fda (commit)
       via  a8bc8a013598f16f70333656abff8be72fae803f (commit)
       via  dd8f1b0527995bc5ad47710d3a483fa18b827bc6 (commit)
       via  9568d12b9bb5db7f39c9627d0059c72cfc6f2eb1 (commit)
       via  b041a675c577e174680913e0da0bf69b1cca83b6 (commit)
       via  c502c5a50aae825683ee4cff629c6839a4209501 (commit)
       via  cb19768b29658ec88b0df76e5b2e221934176057 (commit)
       via  bc614b56c377861b1a51a83778a02320c09025ce (commit)
       via  8d6c35e4dd68baec1b58d566d32d89feb651deac (commit)
       via  13ea738547ce7232c152873970770c21e97d2830 (commit)
       via  4bec5aa50dc40924741221259bfcbb53056cb35c (commit)
       via  378c9c6a57cc24d74fe4ae1c694846d55fad3736 (commit)
       via  fb7dca3e3f07d37ad542f0e7cdf177f616493fe9 (commit)
       via  68f6929a58bf9aab7df691a0db1567e27bc942b8 (commit)
       via  2c61bf045e35d8971412880031412c4f1a9660f6 (commit)
      from  2261d1fd9e1b69d0a60f1f7fe9029317aeb4cf52 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2e03d03bc55b5a612c2bf04d878a72f2ee420d99
Merge: 2261d1fd9 46aadf6a6
Author: Tom Clegg <tom at curii.com>
Date:   Mon Jul 25 10:56:27 2022 -0400

    19166: Merge branch 'main'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --cc lib/crunchrun/integration_test.go
index a18829f30,9860c7949..d56902082
--- a/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@@ -223,10 -223,13 +223,15 @@@ func (s *integrationSuite) TestRunTrivi
  			c.Check(log, trial.matchGetReq, `(?ms).*"reqMethod":"GET".*`)
  			c.Check(log, trial.matchPutReq, `(?ms).*"reqMethod":"PUT".*,"reqPath":"0e3bcff26d51c895a60ea0d4585e134d".*`)
  		}
+ 
+ 		c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*using local keepstore process .* at http://[\d\.]{7,}:\d+.*`)
+ 		c.Check(s.logFiles["crunch-run.txt"], Not(Matches), `(?ms).* at http://127\..*`)
+ 		c.Check(s.logFiles["crunch-run.txt"], Not(Matches), `(?ms).* at http://169\.254\..*`)
+ 		c.Check(s.logFiles["stderr.txt"], Matches, `(?ms).*ARVADOS_KEEP_SERVICES=http://[\d\.]{7,}:\d+\n.*`)
  	}
 +}
  
 +func (s *integrationSuite) TestRunTrivialContainerWithNoLocalKeepstore(c *C) {
  	// Check that (1) config is loaded from $ARVADOS_CONFIG when
  	// not provided on stdin and (2) if a local keepstore is not
  	// started, crunch-run.txt explains why not.

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list