From 838f8e28636cfbb0b4ddf790af611676d392e8f5 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Wed, 5 Aug 2026 14:26:22 -0700 Subject: [PATCH 1/3] fix: make group and metadata prefixes optional --- doi/helm/Chart.yaml | 2 +- doi/helm/config/doi.properties | 8 ++++++-- doi/helm/examples/values.example.yaml | 5 +++-- doi/helm/values.yaml | 12 ++++++------ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/doi/helm/Chart.yaml b/doi/helm/Chart.yaml index 9b9898b..7244335 100644 --- a/doi/helm/Chart.yaml +++ b/doi/helm/Chart.yaml @@ -8,6 +8,6 @@ maintainers: type: application -version: 0.1.0 +version: 0.1.1 appVersion: "1.2.0" diff --git a/doi/helm/config/doi.properties b/doi/helm/config/doi.properties index 9e80fa8..4bd32dd 100644 --- a/doi/helm/config/doi.properties +++ b/doi/helm/config/doi.properties @@ -1,9 +1,13 @@ ca.nrc.cadc.doi.vospaceParentUri = {{ .Values.application.config.vospaceParentUri | required ".Values.application.config.vospaceParentUri is required" }} -ca.nrc.cadc.doi.metaDataPrefix = {{ .Values.application.config.metaDataPrefix | required ".Values.application.config.metaDataPrefix is required" }} -ca.nrc.cadc.doi.groupPrefix = {{ .Values.application.config.groupPrefix | required ".Values.application.config.groupPrefix is required" }} ca.nrc.cadc.doi.landingUrl = {{ .Values.application.config.landingUrl | required ".Values.application.config.landingUrl is required" }} ca.nrc.cadc.doi.datacite.mdsUrl = {{ .Values.application.config.mdsUrl | required ".Values.application.config.mdsUrl is required" }} ca.nrc.cadc.doi.datacite.accountPrefix = {{ .Values.application.config.accountPrefix | required ".Values.application.config.accountPrefix is required" }} +{{- with .Values.application.config.metaDataPrefix }} +ca.nrc.cadc.doi.metaDataPrefix = {{ . }} +{{- end }} +{{- with .Values.application.config.groupPrefix }} +ca.nrc.cadc.doi.groupPrefix = {{ . }} +{{- end }} {{- with .Values.application.config.doiIdentifierPrefix }} ca.nrc.cadc.doi.doiIdentifierPrefix = {{ . }} {{- end }} diff --git a/doi/helm/examples/values.example.yaml b/doi/helm/examples/values.example.yaml index 4deb5e5..2bb29c7 100644 --- a/doi/helm/examples/values.example.yaml +++ b/doi/helm/examples/values.example.yaml @@ -17,11 +17,12 @@ application: config: vospaceParentUri: vos://example.org~arc/doi - metaDataPrefix: doi - groupPrefix: doi landingUrl: https://doi.example.org/doi mdsUrl: https://mds.datacite.org accountPrefix: "10.5072" + # Optional: + # metaDataPrefix: doi + # groupPrefix: doi datacite: auth: diff --git a/doi/helm/values.yaml b/doi/helm/values.yaml index 4b0a835..65de6fa 100644 --- a/doi/helm/values.yaml +++ b/doi/helm/values.yaml @@ -42,12 +42,6 @@ application: # VOSpace URI to the parent DOI folder. vospaceParentUri: "vos://example.org~arc/doi" - # Prefix prepended to the DOI name for metadata stored in VOSpace. - metaDataPrefix: "doi" - - # Prefix prepended to the DOI name to create the backing GMS group name. - groupPrefix: "doi" - # DOI landing page URL. landingUrl: "https://example.org/doi" @@ -57,6 +51,12 @@ application: # Registered prefix for the DataCite account. accountPrefix: "" + # Optional prefix prepended to the DOI name for metadata stored in VOSpace. + metaDataPrefix: "" + + # Optional prefix prepended to the DOI name to create the backing GMS group name. + groupPrefix: "" + # Optional DOI identifier prefix. doiIdentifierPrefix: "" From 8f8d80263ea6121a0a06586e607c49d7d2886c08 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Wed, 5 Aug 2026 14:36:37 -0700 Subject: [PATCH 2/3] fix: only group prefix is optional --- doi/helm/config/doi.properties | 4 +--- doi/helm/examples/values.example.yaml | 2 +- doi/helm/values.yaml | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/doi/helm/config/doi.properties b/doi/helm/config/doi.properties index 4bd32dd..a5b88b1 100644 --- a/doi/helm/config/doi.properties +++ b/doi/helm/config/doi.properties @@ -1,13 +1,11 @@ ca.nrc.cadc.doi.vospaceParentUri = {{ .Values.application.config.vospaceParentUri | required ".Values.application.config.vospaceParentUri is required" }} +ca.nrc.cadc.doi.groupPrefix = {{ .Values.application.config.groupPrefix | required ".Values.application.config.groupPrefix is required" }} ca.nrc.cadc.doi.landingUrl = {{ .Values.application.config.landingUrl | required ".Values.application.config.landingUrl is required" }} ca.nrc.cadc.doi.datacite.mdsUrl = {{ .Values.application.config.mdsUrl | required ".Values.application.config.mdsUrl is required" }} ca.nrc.cadc.doi.datacite.accountPrefix = {{ .Values.application.config.accountPrefix | required ".Values.application.config.accountPrefix is required" }} {{- with .Values.application.config.metaDataPrefix }} ca.nrc.cadc.doi.metaDataPrefix = {{ . }} {{- end }} -{{- with .Values.application.config.groupPrefix }} -ca.nrc.cadc.doi.groupPrefix = {{ . }} -{{- end }} {{- with .Values.application.config.doiIdentifierPrefix }} ca.nrc.cadc.doi.doiIdentifierPrefix = {{ . }} {{- end }} diff --git a/doi/helm/examples/values.example.yaml b/doi/helm/examples/values.example.yaml index 2bb29c7..22660c2 100644 --- a/doi/helm/examples/values.example.yaml +++ b/doi/helm/examples/values.example.yaml @@ -17,12 +17,12 @@ application: config: vospaceParentUri: vos://example.org~arc/doi + groupPrefix: doi landingUrl: https://doi.example.org/doi mdsUrl: https://mds.datacite.org accountPrefix: "10.5072" # Optional: # metaDataPrefix: doi - # groupPrefix: doi datacite: auth: diff --git a/doi/helm/values.yaml b/doi/helm/values.yaml index 65de6fa..8d50f4f 100644 --- a/doi/helm/values.yaml +++ b/doi/helm/values.yaml @@ -42,6 +42,9 @@ application: # VOSpace URI to the parent DOI folder. vospaceParentUri: "vos://example.org~arc/doi" + # Prefix prepended to the DOI name to create the backing GMS group name. + groupPrefix: "doi" + # DOI landing page URL. landingUrl: "https://example.org/doi" @@ -54,9 +57,6 @@ application: # Optional prefix prepended to the DOI name for metadata stored in VOSpace. metaDataPrefix: "" - # Optional prefix prepended to the DOI name to create the backing GMS group name. - groupPrefix: "" - # Optional DOI identifier prefix. doiIdentifierPrefix: "" From e8dcc4d3352f49bf28f2818c223594da6a82fd55 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Wed, 5 Aug 2026 14:38:48 -0700 Subject: [PATCH 3/3] fix: fix to make group prefix optional and metadata prefix mandatory --- doi/helm/config/doi.properties | 6 +++--- doi/helm/examples/values.example.yaml | 4 ++-- doi/helm/values.yaml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doi/helm/config/doi.properties b/doi/helm/config/doi.properties index a5b88b1..7a12ca5 100644 --- a/doi/helm/config/doi.properties +++ b/doi/helm/config/doi.properties @@ -1,10 +1,10 @@ ca.nrc.cadc.doi.vospaceParentUri = {{ .Values.application.config.vospaceParentUri | required ".Values.application.config.vospaceParentUri is required" }} -ca.nrc.cadc.doi.groupPrefix = {{ .Values.application.config.groupPrefix | required ".Values.application.config.groupPrefix is required" }} +ca.nrc.cadc.doi.metaDataPrefix = {{ .Values.application.config.metaDataPrefix | required ".Values.application.config.metaDataPrefix is required" }} ca.nrc.cadc.doi.landingUrl = {{ .Values.application.config.landingUrl | required ".Values.application.config.landingUrl is required" }} ca.nrc.cadc.doi.datacite.mdsUrl = {{ .Values.application.config.mdsUrl | required ".Values.application.config.mdsUrl is required" }} ca.nrc.cadc.doi.datacite.accountPrefix = {{ .Values.application.config.accountPrefix | required ".Values.application.config.accountPrefix is required" }} -{{- with .Values.application.config.metaDataPrefix }} -ca.nrc.cadc.doi.metaDataPrefix = {{ . }} +{{- with .Values.application.config.groupPrefix }} +ca.nrc.cadc.doi.groupPrefix = {{ . }} {{- end }} {{- with .Values.application.config.doiIdentifierPrefix }} ca.nrc.cadc.doi.doiIdentifierPrefix = {{ . }} diff --git a/doi/helm/examples/values.example.yaml b/doi/helm/examples/values.example.yaml index 22660c2..480344b 100644 --- a/doi/helm/examples/values.example.yaml +++ b/doi/helm/examples/values.example.yaml @@ -17,12 +17,12 @@ application: config: vospaceParentUri: vos://example.org~arc/doi - groupPrefix: doi + metaDataPrefix: doi landingUrl: https://doi.example.org/doi mdsUrl: https://mds.datacite.org accountPrefix: "10.5072" # Optional: - # metaDataPrefix: doi + # groupPrefix: doi datacite: auth: diff --git a/doi/helm/values.yaml b/doi/helm/values.yaml index 8d50f4f..89e528f 100644 --- a/doi/helm/values.yaml +++ b/doi/helm/values.yaml @@ -42,8 +42,8 @@ application: # VOSpace URI to the parent DOI folder. vospaceParentUri: "vos://example.org~arc/doi" - # Prefix prepended to the DOI name to create the backing GMS group name. - groupPrefix: "doi" + # Prefix prepended to the DOI name for metadata stored in VOSpace. + metaDataPrefix: "doi" # DOI landing page URL. landingUrl: "https://example.org/doi" @@ -54,8 +54,8 @@ application: # Registered prefix for the DataCite account. accountPrefix: "" - # Optional prefix prepended to the DOI name for metadata stored in VOSpace. - metaDataPrefix: "" + # Optional prefix prepended to the DOI name to create the backing GMS group name. + groupPrefix: "" # Optional DOI identifier prefix. doiIdentifierPrefix: ""