hyrax 3.0.0.pre.rc4 → 3.0.0

data/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '3.0.0-rc4'
+gem 'hyrax', '3.0.0'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.rc4
+  version: 3.0.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1178,6 +1178,8 @@ executables:
 - db-migrate-seed.sh
 - db-wait.sh
 - hyrax-entrypoint.sh
+- solrcloud-assign-configset.sh
+- solrcloud-upload-configset.sh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -1773,6 +1775,7 @@ files:
 - app/indexers/hyrax/repository_reindexer.rb
 - app/indexers/hyrax/resource_indexer.rb
 - app/indexers/hyrax/valkyrie_collection_indexer.rb
+- app/indexers/hyrax/valkyrie_file_set_indexer.rb
 - app/indexers/hyrax/valkyrie_indexer.rb
 - app/indexers/hyrax/valkyrie_work_indexer.rb
 - app/indexers/hyrax/visibility_indexer.rb
@@ -2597,21 +2600,8 @@ files:
 - bin/db-migrate-seed.sh
 - bin/db-wait.sh
 - bin/hyrax-entrypoint.sh
-- chart/fcrepo/.gitignore
-- chart/fcrepo/.helmignore
-- chart/fcrepo/Chart.yaml
-- chart/fcrepo/README.md
-- chart/fcrepo/templates/NOTES.txt
-- chart/fcrepo/templates/_helpers.tpl
-- chart/fcrepo/templates/configmap-env.yaml
-- chart/fcrepo/templates/deployment.yaml
-- chart/fcrepo/templates/ingress.yaml
-- chart/fcrepo/templates/pvc.yaml
-- chart/fcrepo/templates/secret.yaml
-- chart/fcrepo/templates/service.yaml
-- chart/fcrepo/templates/serviceaccount.yaml
-- chart/fcrepo/templates/tests/test-connection.yaml
-- chart/fcrepo/values.yaml
+- bin/solrcloud-assign-configset.sh
+- bin/solrcloud-upload-configset.sh
 - chart/hyrax/.gitignore
 - chart/hyrax/.helmignore
 - chart/hyrax/Chart.yaml
@@ -2619,8 +2609,9 @@ files:
 - chart/hyrax/templates/NOTES.txt
 - chart/hyrax/templates/_helpers.tpl
 - chart/hyrax/templates/configmap-env.yaml
+- chart/hyrax/templates/cron-embargo.yaml
+- chart/hyrax/templates/cron-lease.yaml
 - chart/hyrax/templates/deployment.yaml
-- chart/hyrax/templates/fcrepo-secret.yaml
 - chart/hyrax/templates/hpa.yaml
 - chart/hyrax/templates/ingress.yaml
 - chart/hyrax/templates/secrets.yaml
@@ -2859,6 +2850,7 @@ files:
 - lib/hyrax/transactions/steps/apply_collection_permission_template.rb
 - lib/hyrax/transactions/steps/apply_permission_template.rb
 - lib/hyrax/transactions/steps/apply_visibility.rb
+- lib/hyrax/transactions/steps/delete_resource.rb
 - lib/hyrax/transactions/steps/destroy_work.rb
 - lib/hyrax/transactions/steps/ensure_admin_set.rb
 - lib/hyrax/transactions/steps/ensure_permission_template.rb
@@ -2873,6 +2865,7 @@ files:
 - lib/hyrax/transactions/transaction.rb
 - lib/hyrax/transactions/update_work.rb
 - lib/hyrax/transactions/work_create.rb
+- lib/hyrax/transactions/work_destroy.rb
 - lib/hyrax/valkyrie_can_can_adapter.rb
 - lib/hyrax/version.rb
 - lib/hyrax/zotero.rb
@@ -2881,6 +2874,7 @@ files:
 - lib/tasks/controlled_vocabularies.rake
 - lib/tasks/default_admin_set.rake
 - lib/tasks/default_collection_type.rake
+- lib/tasks/embargo_lease.rake
 - lib/tasks/hyrax.rake
 - lib/tasks/hyrax_user.rake
 - lib/tasks/install.rake
@@ -2954,9 +2948,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key:

data/chart/fcrepo/.gitignore

@@ -1,2 +0,0 @@
-charts/*
-Chart.lock

data/chart/fcrepo/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

data/chart/fcrepo/Chart.yaml

@@ -1,11 +0,0 @@
-apiVersion: v2
-name: fcrepo
-description: Fedora Commons Repository 4
-type: application
-version: 0.4.1
-appVersion: 4.7
-dependencies:
-  - name: postgresql
-    version: 9.3.3
-    repository: https://charts.bitnami.com/bitnami
-    condition: postgresql.enabled

data/chart/fcrepo/README.md

@@ -1,50 +0,0 @@
-Fedora Commons Helm Chart
-=========================
-
-Fedora is the flexible, modular, open source repository platform with native
-linked data support.
-
-## Installation
-
-```sh
-helm dep up chart/fcrepo
-helm install fcrepo chart/fcrepo
-```
-
-## Configuration
-
-By default, this chart deploys with Postgresql as the backend for Fedora.
-Without other configuration, it will deploy a new Postgresql instance/database
-as a service available to the `fcrepo` deployment.
-
-In practice, users may want to forego installing postgres for two reasons:
-
-_First_, when you are deploying Fedora into a more complex application
-environment you may wish to reuse an existing Postgres instance already
-maintained with that environment.
-
-In this case, `fcrepo` should be deployed with postgresql explictly disabled, an
-`exernalDatabaseUsername`, and an `fcrepoSecretName`. `fcrepoSecretName` must
-correspond to an existing secret providing `DATABASE_PASSWORD`, `DATABASE_HOST`,
-and `JAVA_OPTS`.
-
-Optionally, a `externalDatabaseName` may be given to avoid collissions in the
-case that the default `fcrepo` is not an acceptable database name.
-
-This is usually done in the context of a parent chart which provides the postgresql instance, for example:
-
-```yaml
-fcrepo:
-  enabled: true
-  fcrepoSecretName: "mychart.fcrepo.fullname"
-  externalDatabaseUsername: "mydbuser"
-  servicePort: 8080
-  postgresql:
-    enabled: false
-```
-
-_Second_, because they want to use another backend for Fedora. This use case is broadly unsupported here. In theory, you can get a default (Infinispan) configuration by setting `postgresql.enabled` to `false`. **THIS CONFIGURATION IS UNTESTED AND UNSUPPORTED**:
-
-```sh
-helm install --set postgresql.enabled=false fcrepo-test chart/fcrepo
-```

data/chart/fcrepo/templates/NOTES.txt

@@ -1,21 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "fcrepo.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "fcrepo.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "fcrepo.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.servicePort | default .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "fcrepo.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:{{ .Values.servicePort | default .Values.service.port }}
-{{- end }}

data/chart/fcrepo/templates/_helpers.tpl

@@ -1,68 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "fcrepo.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "fcrepo.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "fcrepo.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "fcrepo.labels" -}}
-helm.sh/chart: {{ include "fcrepo.chart" . }}
-{{ include "fcrepo.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "fcrepo.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "fcrepo.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "fcrepo.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "fcrepo.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{- define "fcrepo.postgresql.fullname" -}}
-{{- $name := default "postgresql" .Values.postgresql.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}

data/chart/fcrepo/templates/configmap-env.yaml

@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "fcrepo.fullname" . }}-env
-  labels:
-    app.kubernetes.io/name: {{ include "fcrepo.name" . }}
-    helm.sh/chart: {{ include "fcrepo.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-data:
-  {{- if .Values.postgresql.enabled }}
-  DATABASE_NAME: {{ .Values.postgresql.postgresqlDatabase }}
-  DATABASE_USER: {{ .Values.postgresql.postgresqlUsername }}
-  {{- else }}
-  {{- if .Values.externalDatabaseUsername }}
-  DATABASE_NAME: {{ .Values.externalDatabaseName | default "fcrepo" }}
-  DATABASE_USER: {{ .Values.externalDatabaseUsername }}
-  {{- end }}
-  {{- end }}

data/chart/fcrepo/templates/deployment.yaml

@@ -1,109 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "fcrepo.fullname" . }}
-  labels:
-    {{- include "fcrepo.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      {{- include "fcrepo.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-    {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      labels:
-        {{- include "fcrepo.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      restartPolicy: Always
-      serviceAccountName: {{ include "fcrepo.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      volumes:
-        - name: data
-          persistentVolumeClaim:
-            claimName: {{ template "fcrepo.fullname" . }}
-      initContainers:
-        - name: "remove-lost-found"
-          image: "busybox:1.32.0"
-          command:
-            - rm
-            - -fr
-            - /data/lost+found
-          volumeMounts:
-            - name: data
-              mountPath: /data
-        {{- if not .Values.postgresql.enabled }}
-        {{- if .Values.fcrepoSecretName }}
-        - name: "init-db"
-          image: {{ .Values.postgresql.image.repository | default "bitnami/postgresql" }}:{{ .Values.postgresql.image.tag | default "latest" }}
-          command:
-            - sh
-            - -c
-            - export PGPASSWORD=$DATABASE_PASSWORD PGHOST=$DATABASE_HOST PGUSER=$DATABASE_USER;
-            - psql -tc "SELECT 1 FROM pg_database WHERE datname = '$DATABASE_NAME'" | grep -q 1 || createdb -e -w $DATABASE_NAME
-          envFrom:
-            - configMapRef:
-                name: {{ include "fcrepo.fullname" . }}-env
-            - secretRef:
-                name: {{ include .Values.fcrepoSecretName . }}
-        {{- end }}
-        {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "fcrepo.fullname" . }}-env
-            {{- if .Values.postgresql.enabled }}
-            - secretRef:
-                name: {{ template "fcrepo.fullname" . }}
-            {{- else }}
-            {{- if .Values.fcrepoSecretName }}
-            - secretRef:
-                name: {{ include .Values.fcrepoSecretName . }}
-            {{- end }}
-            {{- end }}
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          volumeMounts:
-            - name: data
-              mountPath: /data
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-            initialDelaySeconds: {{ default 15 .Values.healthCheck.initialDelay }}
-          readinessProbe:
-            httpGet:
-              path: /fcrepo
-              port: http
-            initialDelaySeconds: {{ default 15 .Values.healthCheck.initialDelay }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}

data/chart/fcrepo/templates/ingress.yaml

@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "fcrepo.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "fcrepo.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ . }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-          {{- end }}
-    {{- end }}
-  {{- end }}