[ARVADOS] updated: 1.3.0-2424-gc0a9b9a32

Git user git at public.arvados.org
Tue Apr 7 14:05:55 UTC 2020


Summary of changes:
 apps/workbench/Gemfile.lock                        |   8 +-
 .../config/initializers/actionview_xss_fix.rb      |  32 +++
 .../test/unit/helpers/javascript_helper_test.rb    |  17 ++
 build/build-dev-docker-jobs-image.sh               |  13 +-
 build/run-build-packages.sh                        |   9 +-
 build/run-tests.sh                                 |   6 +-
 lib/boot/postgresql.go                             |   2 +-
 lib/boot/supervisor.go                             |  19 +-
 lib/install/deps.go                                |   8 +-
 sdk/cwl/arvados_cwl/__init__.py                    |  37 ---
 sdk/cwl/arvados_cwl/arvworkflow.py                 |  29 +-
 sdk/cwl/arvados_cwl/runner.py                      |   5 +-
 sdk/cwl/setup.py                                   |  11 +-
 sdk/cwl/test_with_arvbox.sh                        |  26 +-
 sdk/cwl/tests/test_container.py                    |  15 +-
 sdk/cwl/tests/test_submit.py                       |   3 +-
 sdk/cwl/tests/wf/scatter2_subwf.cwl                |  15 +-
 .../arvados/client/api/client/LinksApiClient.java  |  36 +++
 .../java/org/arvados/client/api/model/Link.java    |  62 +++++
 .../api/model/{UserList.java => LinkList.java}     |   8 +-
 sdk/python/arvados/commands/arv_copy.py            | 294 +--------------------
 sdk/python/setup.py                                |   2 +-
 sdk/python/tests/run_test_server.py                |   1 +
 services/api/Gemfile.lock                          |   4 +-
 24 files changed, 266 insertions(+), 396 deletions(-)
 create mode 100644 apps/workbench/config/initializers/actionview_xss_fix.rb
 create mode 100644 apps/workbench/test/unit/helpers/javascript_helper_test.rb
 create mode 100644 sdk/java-v2/src/main/java/org/arvados/client/api/client/LinksApiClient.java
 create mode 100644 sdk/java-v2/src/main/java/org/arvados/client/api/model/Link.java
 copy sdk/java-v2/src/main/java/org/arvados/client/api/model/{UserList.java => LinkList.java} (80%)

       via  c0a9b9a3291e14c75711d5849dc5365e2166fccd (commit)
       via  53da7a1e224a95d8e68209204285f3fc227d84c8 (commit)
       via  cd04b8ba074c03400cc506faa5890debcc0231a2 (commit)
       via  1040ff7941276a0743f9623f14858e18c87e9cdc (commit)
       via  97a6bda73db7fe1133a6171eb74178ea46df0a9f (commit)
       via  48350f3e8fe2f47eb6ff9f862a8d83fb8a027c6d (commit)
       via  931f1c866814b18046a8d9b6b1033d71e9a5c2d1 (commit)
       via  2f66d4cc05e9442a9bb69969744d0750a02a1ed4 (commit)
       via  9728c2d9d4ec3e02e48f562ff16f1338054ce143 (commit)
       via  252e4cb551974b888cfe28cc4a51a241b91d529a (commit)
       via  47a5e831576c8ed63e2328de52134ecf395639d4 (commit)
       via  07dbd859d0b05d79680570c00c43a722102d7ea3 (commit)
       via  bbe4d3c94c2dfcbd97f4c30c0bfb3c4a9c7f9f89 (commit)
       via  fa7cf8fa43d32ef0d438976ed9e87fc7b91bc89d (commit)
       via  f36dffa91a233b429a4ca3d4489d1cbb3baf5720 (commit)
       via  ed502ed611a4ac8378886fbd930602ca803e73e8 (commit)
       via  792e8c699056676a48475724c12fe3cf92e7d805 (commit)
       via  28bf445fac3da5d717e7adea06dfca29b86ffc66 (commit)
       via  d55916d62f4cb6ab04dcea64aea5498e6dec4f33 (commit)
       via  56615d53fbdc333c05bed81c3be7f397a0a73669 (commit)
       via  50a4212ec9319d9a700ba5cdde12b6f72e3a96f9 (commit)
       via  20e09ab0726d7f0edb4333277c3403f995b960ce (commit)
       via  bba0a62a8236d9776308e66dbf354be6c4ce96bf (commit)
       via  c5f67bbc40e8f6a98854b1bf67fc6a98cff80790 (commit)
       via  60ed2df387ca0ee304bf8d2e40f2199184375b29 (commit)
       via  c87d343391acec59a988de8d693c9ae5911a65c7 (commit)
       via  b6d7efab2c4bffa3fabd55b166e44cca8ac1391f (commit)
       via  99d3277ad97ef10b9d92bff8ab3844cf6765949e (commit)
       via  414bb787d6be54225a546e100478a97b65b61199 (commit)
       via  ef109c816015c97809432b48d8110e171ec89cd0 (commit)
       via  cf447c1718535fe924005db53bed5011c714dd63 (commit)
       via  446dffef8db3b0df3367d84d6ab3da1b6c8bcc14 (commit)
       via  5782d9e6f37bde05fb7dc06a312a5a909c7223e4 (commit)
       via  0d9398be2b572bc89842dff62335495e02de1bf6 (commit)
       via  f3b02f85ce244e22033e40e59caf87228b11faee (commit)
       via  a3c1bd10eaad38b1d05b2c7a1c76619776651059 (commit)
       via  28528aed21ad771e144d5d01fb8691c8cafba376 (commit)
       via  c82d1b4384ee253576f4693d76eef389d15e0407 (commit)
       via  0bb92232b7fbfc5ccf5fcbe131d89ce15a88cf02 (commit)
       via  a07cb4959be02bcd3d367a3aa51b3f26a07a6edd (commit)
       via  91051d168edce4a8c354aeba70c113f791eeb8c6 (commit)
       via  19621d2bacc926f9227628c91e7c35924d442570 (commit)
       via  1263515dfda478075d7d3e07877c77e4c131fc47 (commit)
       via  720ac44caf998a136b64b7968253dd68972a69f4 (commit)
      from  9e48b679541d2651e2519c7566e975049c00660c (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 c0a9b9a3291e14c75711d5849dc5365e2166fccd
Merge: 53da7a1e2 cd04b8ba0
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Tue Mar 31 13:52:23 2020 -0400

    16053: Merge branch 'master'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>


commit 53da7a1e224a95d8e68209204285f3fc227d84c8
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Tue Mar 31 13:51:31 2020 -0400

    16053: Error out on unimplemented install in production mode.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 5496be81a..cbcf7438b 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -8,6 +8,7 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -65,10 +66,15 @@ func (installCommand) RunCommand(prog string, args []string, stdin io.Reader, st
 	case "production":
 		prod = true
 	default:
-		err = fmt.Errorf("cluster type must be 'development', 'test', or 'production'")
+		err = fmt.Errorf("invalid cluster type %q (must be 'development', 'test', or 'production')", *clusterType)
 		return 2
 	}
 
+	if prod {
+		err = errors.New("production install is not yet implemented")
+		return 1
+	}
+
 	osv, err := identifyOS()
 	if err != nil {
 		return 1

commit 792e8c699056676a48475724c12fe3cf92e7d805
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Wed Mar 25 14:57:42 2020 -0400

    16053: Specify utf8 encoding when creating databases.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/boot/postgresql.go b/lib/boot/postgresql.go
index df90f36af..34ccf04a8 100644
--- a/lib/boot/postgresql.go
+++ b/lib/boot/postgresql.go
@@ -154,7 +154,7 @@ func (runPostgreSQL) Run(ctx context.Context, fail func(error), super *Superviso
 	if err != nil {
 		return fmt.Errorf("createuser failed: %s", err)
 	}
-	_, err = conn.ExecContext(ctx, `CREATE DATABASE `+pq.QuoteIdentifier(super.cluster.PostgreSQL.Connection["dbname"]))
+	_, err = conn.ExecContext(ctx, `CREATE DATABASE `+pq.QuoteIdentifier(super.cluster.PostgreSQL.Connection["dbname"])+` WITH TEMPLATE template0 ENCODING 'utf8'`)
 	if err != nil {
 		return fmt.Errorf("createdb failed: %s", err)
 	}
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index f5ee9c383..4f4d13858 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -675,6 +675,7 @@ def setup_config():
 	    "dbname": "arvados_test",
 	    "user": "arvados",
 	    "password": "insecure_arvados_test",
+            "template": "template0", # used by RailsAPI when [re]creating the database
         }
 
     localhost = "127.0.0.1"

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list