Merge branch 'master' into 14260-runtime-token

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --combined services/api/db/structure.sql
index 636306f976e3b98a3368f0f1ed9f4dca4dd50287,5b579bd39e1e8760cd3243bf7dbe50b206d131f4..b9db1add053cf53a1295f187a1b8d9244895ec99
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -172,7 -172,10 +172,10 @@@ CREATE TABLE public.collections 
      is_trashed boolean DEFAULT false NOT NULL,
      storage_classes_desired jsonb DEFAULT '["default"]'::jsonb,
      storage_classes_confirmed jsonb DEFAULT '[]'::jsonb,
-     storage_classes_confirmed_at timestamp without time zone
+     storage_classes_confirmed_at timestamp without time zone,
+     current_version_uuid character varying,
+     version integer DEFAULT 1 NOT NULL,
+     preserve_version boolean DEFAULT false
  );
  
  
@@@ -299,8 -302,7 +302,8 @@@ CREATE TABLE public.container_requests 
      log_uuid character varying(255),
      output_name character varying(255) DEFAULT NULL::character varying,
      output_ttl integer DEFAULT 0 NOT NULL,
 -    secret_mounts jsonb DEFAULT '{}'::jsonb
 +    secret_mounts jsonb DEFAULT '{}'::jsonb,
 +    runtime_token text
  );
  
  
@@@ -356,10 -358,7 +359,10 @@@ CREATE TABLE public.containers 
      scheduling_parameters text,
      secret_mounts jsonb DEFAULT '{}'::jsonb,
      secret_mounts_md5 character varying DEFAULT '99914b932bd37a50b983c5e7c90ae93b'::character varying,
 -    runtime_status jsonb DEFAULT '{}'::jsonb
 +    runtime_status jsonb DEFAULT '{}'::jsonb,
 +    runtime_user_uuid text,
 +    runtime_auth_scopes jsonb,
 +    runtime_token text
  );
  
  
@@@ -1635,7 -1634,7 +1638,7 @@@ CREATE INDEX collections_full_text_sear
  -- Name: collections_search_index; Type: INDEX; Schema: public; Owner: -
  --
  
- CREATE INDEX collections_search_index ON public.collections USING btree (owner_uuid, modified_by_client_uuid, modified_by_user_uuid, portable_data_hash, uuid, name);
+ CREATE INDEX collections_search_index ON public.collections USING btree (owner_uuid, modified_by_client_uuid, modified_by_user_uuid, portable_data_hash, uuid, name, current_version_uuid);
  
  
  --
@@@ -1785,6 -1784,13 +1788,13 @@@ CREATE UNIQUE INDEX index_authorized_ke
  CREATE INDEX index_collections_on_created_at ON public.collections USING btree (created_at);
  
  
+ --
+ -- Name: index_collections_on_current_version_uuid_and_version; Type: INDEX; Schema: public; Owner: -
+ --
+ 
+ CREATE UNIQUE INDEX index_collections_on_current_version_uuid_and_version ON public.collections USING btree (current_version_uuid, version);
+ 
+ 
  --
  -- Name: index_collections_on_delete_at; Type: INDEX; Schema: public; Owner: -
  --
@@@ -1824,7 -1830,7 +1834,7 @@@ CREATE INDEX index_collections_on_owner
  -- Name: index_collections_on_owner_uuid_and_name; Type: INDEX; Schema: public; Owner: -
  --
  
- CREATE UNIQUE INDEX index_collections_on_owner_uuid_and_name ON public.collections USING btree (owner_uuid, name) WHERE (is_trashed = false);
+ CREATE UNIQUE INDEX index_collections_on_owner_uuid_and_name ON public.collections USING btree (owner_uuid, name) WHERE ((is_trashed = false) AND ((current_version_uuid)::text = (uuid)::text));
  
  
  --
@@@ -3173,9 -3179,14 +3183,18 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20180904110712');
  
+ INSERT INTO schema_migrations (version) VALUES ('20180913175443');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20180915155335');
+ 
  INSERT INTO schema_migrations (version) VALUES ('20180917205609');
  
 +INSERT INTO schema_migrations (version) VALUES ('20181005192222');
 +
 +INSERT INTO schema_migrations (version) VALUES ('20181011184200');
 +
+ INSERT INTO schema_migrations (version) VALUES ('20180919001158');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20181001175023');
+ 
+ INSERT INTO schema_migrations (version) VALUES ('20181004131141');