diff --git a/modules/accelerators/cdf_common/functions/write.Function.yaml b/modules/accelerators/cdf_common/functions/write.Function.yaml index 82bcb05b..1c957c17 100644 --- a/modules/accelerators/cdf_common/functions/write.Function.yaml +++ b/modules/accelerators/cdf_common/functions/write.Function.yaml @@ -3,7 +3,4 @@ externalId: contextualization_connection_writer owner: Anonymous description: Writes all approved Annotations as direct relations connections. functionPath: handler.py -dataSetExternalId: {{ dataset }} - -# In DM only projects function files are stored as Node so space needs to be set. space: {{ functionSpace }} diff --git a/modules/accelerators/cdf_ingestion/README.md b/modules/accelerators/cdf_ingestion/README.md index 0b952de2..b8f96578 100644 --- a/modules/accelerators/cdf_ingestion/README.md +++ b/modules/accelerators/cdf_ingestion/README.md @@ -117,7 +117,7 @@ workflow: ingestion dataset: ingestion # Authentication (UPDATE REQUIRED) -groupSourceId: # Your IdP group source ID +groupSourceId: ${GROUP_SOURCE_ID} # Your IdP group source ID # Service Account Credentials for Scheduled Runs ingestionClientId: ${INGESTION_CLIENT_ID} diff --git a/modules/accelerators/cdf_ingestion/default.config.yaml b/modules/accelerators/cdf_ingestion/default.config.yaml index 32bcc8ed..6ba7cf4f 100644 --- a/modules/accelerators/cdf_ingestion/default.config.yaml +++ b/modules/accelerators/cdf_ingestion/default.config.yaml @@ -1,7 +1,7 @@ workflow: ingestion dataset: ingestion # Update GROUP_SOURCE_ID to your group source ID -groupSourceId: +groupSourceId: ${GROUP_SOURCE_ID} # Update INGESTION_CLIENT_ID and INGESTION_CLIENT_SECRET to your ingestion client ID and secret ingestionClientId: ${IDP_CLIENT_ID} ingestionClientSecret: ${IDP_CLIENT_SECRET} diff --git a/modules/accelerators/contextualization/cdf_entity_matching/default.config.yaml b/modules/accelerators/contextualization/cdf_entity_matching/default.config.yaml index e6f27a73..86e52234 100644 --- a/modules/accelerators/contextualization/cdf_entity_matching/default.config.yaml +++ b/modules/accelerators/contextualization/cdf_entity_matching/default.config.yaml @@ -28,5 +28,5 @@ workflow: EntityMatching workflowClientId: ${IDP_CLIENT_ID} workflowClientSecret: ${IDP_CLIENT_SECRET} # Update GROUP_SOURCE_ID to your group source ID -entity_matching_processing_group_source_id: +entity_matching_processing_group_source_id: ${GROUP_SOURCE_ID} reservedWordPrefix: Enterprise_ diff --git a/modules/accelerators/contextualization/cdf_entity_matching/functions/functions.Function.yaml b/modules/accelerators/contextualization/cdf_entity_matching/functions/functions.Function.yaml index e073d98c..3ca726e1 100644 --- a/modules/accelerators/contextualization/cdf_entity_matching/functions/functions.Function.yaml +++ b/modules/accelerators/contextualization/cdf_entity_matching/functions/functions.Function.yaml @@ -2,7 +2,6 @@ # and externalId as the function itself as defined below. - name: 'dm:context:timeseries:entity_matching' externalId: 'fn_dm_context_timeseries_entity_matching' - dataSetExternalId: 'ds_timeseries_{{location_name}}' owner: 'Anonymous' description: 'Contextualization of P&ID files creating annotations in Data model' space: {{ functionSpace }} @@ -15,10 +14,8 @@ # Number of cores, not available in Azure runtime: 'py312' functionPath: 'handler.py' - # Data set id for the zip file with the code that is uploaded. - name: 'dm:context:metadata_update' externalId: 'fn_dm_context_metadata_update' - dataSetExternalId: 'ds_timeseries_{{location_name}}' owner: 'Anonymous' description: 'Update aliases for files and attests as prep for Contextualization of P&ID files' space: {{ functionSpace }} @@ -30,5 +27,4 @@ CDF_ENV: '${CDF_ENVIRON}' # Number of cores, not available in Azure runtime: 'py312' - functionPath: 'handler.py' - # Data set id for the zip file with the code that is uploaded. \ No newline at end of file + functionPath: 'handler.py' \ No newline at end of file diff --git a/modules/accelerators/contextualization/cdf_file_annotation/README.md b/modules/accelerators/contextualization/cdf_file_annotation/README.md index 5a5e75a8..40486253 100644 --- a/modules/accelerators/contextualization/cdf_file_annotation/README.md +++ b/modules/accelerators/contextualization/cdf_file_annotation/README.md @@ -374,7 +374,7 @@ workflowExternalId: wf_file_annotation workflowSchedule: "3-59/15 * * * *" # Every 15 min with 3 min offset # Auth Group (UPDATE REQUIRED) -groupSourceId: +groupSourceId: ${GROUP_SOURCE_ID} ``` ### Pipeline Configuration (`ep_file_annotation.config.yaml`) diff --git a/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/hdm.container.yaml b/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/hdm.container.yaml deleted file mode 100644 index e553ccc4..00000000 --- a/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/hdm.container.yaml +++ /dev/null @@ -1,159 +0,0 @@ -- constraints: {} - description: Container for file contextualization pipeline annotation data - externalId: {{ annotationStateExternalId }} - indexes: {} - name: {{ annotationStateExternalId }} - properties: - annotatedPageCount: - autoIncrement: false - immutable: false - nullable: true - type: - list: false - type: int64 - name: Annotated page count - annotationMessage: - autoIncrement: false - immutable: false - nullable: true - autoIncrement: false - immutable: false - nullable: true - type: - collation: ucs_basic - list: false - type: text - name: Annotation message - annotationStatus: - autoIncrement: false - immutable: false - nullable: true - type: - collation: ucs_basic - list: false - type: text - name: Annotation status - patternModeMessage: - autoIncrement: false - immutable: false - nullable: true - type: - type: text - collation: ucs_basic - list: false - name: Pattern mode message - attemptCount: - autoIncrement: false - immutable: false - nullable: true - type: - list: false - type: int64 - name: Attempt count - diagramDetectJobId: - autoIncrement: false - immutable: false - nullable: true - type: - list: false - type: int64 - name: Diagram detect job Id - diagramDetectJobToken: - autoIncrement: false - immutable: false - nullable: true - type: - collation: ucs_basic - list: false - type: text - name: Diagram detect job token - patternModeJobId: - autoIncrement: false - immutable: false - nullable: true - type: - list: false - type: int64 - name: Pattern mode job Id - patternModeJobToken: - autoIncrement: false - immutable: false - nullable: true - type: - collation: ucs_basic - list: false - type: text - name: Pattern mode job token - linkedFile: - autoIncrement: false - immutable: false - nullable: true - type: - list: false - type: direct - name: Linked file - pageCount: - autoIncrement: false - immutable: false - nullable: true - type: - list: false - type: int64 - name: Page count - launchFunctionId: # NOTE: Id of the function that was called. Will be useful as an index for query calls. B-tree - type: - list: false - type: int64 - immutable: false - nullable: true - autoIncrement: false - name: Launch function Id - launchFunctionCallId: # NOTE: specific Id that points to the function log. Will be useful as an index for query calls. B-tree - type: - list: false - type: int64 - immutable: false - nullable: true - autoIncrement: false - name: Launch function call Id - finalizeFunctionId: # NOTE: Id of the function that was called. Will be useful as an index for query calls. B-tree - type: - list: false - type: int64 - immutable: false - nullable: true - autoIncrement: false - name: Finalize function Id - finalizeFunctionCallId: # NOTE: specific Id that points to the function log. Will be useful as an index for query calls. B-tree - type: - list: false - type: int64 - immutable: false - nullable: true - autoIncrement: false - name: Finalize function call Id - space: {{ annotationStateSchemaSpace }} - usedFor: node - indexes: - annotationStatus: - indexType: btree - properties: - - annotationStatus - cursorable: true - diagramDetectJobId: - indexType: btree - properties: - - diagramDetectJobId - cursorable: true - launchFunction: - indexType: btree - properties: - - launchFunctionId - - launchFunctionCallId - cursorable: true - finalizeFunction: - indexType: btree - properties: - - finalizeFunctionId - - finalizeFunctionCallId - cursorable: true \ No newline at end of file diff --git a/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/hdm.node.yaml b/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/hdm.node.yaml deleted file mode 100644 index 86579605..00000000 --- a/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/hdm.node.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- space: SolutionTagsInstanceSpace # NOTE: space that comes from enabling labels in Canvas UI - externalId: file_annotations_solution_tag - sources: - - source: - space: cdf_apps_shared - externalId: CogniteSolutionTag - version: 'v1' - type: view - properties: - name: 'File Annotations' - description: 'Label is used by canvases generated by the file annotation streamlit module. Can be used for any canvas related to file annotatons.' - color: Green # NOTE: can't seem to get this working diff --git a/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/hdm.view.yaml b/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/hdm.view.yaml deleted file mode 100644 index a94e3eff..00000000 --- a/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/hdm.view.yaml +++ /dev/null @@ -1,164 +0,0 @@ -- description: File Annotation State - externalId: {{ annotationStateExternalId }} - implements: - - externalId: CogniteDescribable - space: cdf_cdm - type: view - version: v1 - - externalId: CogniteSourceable - space: cdf_cdm - type: view - version: v1 - name: Annotation State - properties: - annotatedPageCount: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: annotatedPageCount - description: Number of annotated pages - name: Annotated page count - annotationMessage: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: annotationMessage - description: Contains annotations applied or error message - name: Annotation message - annotationStatus: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: annotationStatus - description: Holds the status of the files diagram detect job - name: Annotation status - attemptCount: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: attemptCount - description: Attempt count - name: Attempt count - diagramDetectJobId: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: diagramDetectJobId - description: Diagram detect job Id - name: Diagram detect job Id - diagramDetectJobToken: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: diagramDetectJobToken - description: Diagram detect job token. Used as header in client request. - name: Diagram detect job token - patternModeJobId: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: patternModeJobId - description: Diagram detect job Id with pattern mode - name: Pattern mode job Id - patternModeJobToken: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: patternModeJobToken - description: Diagram detect job token with pattern mode. Used as header in client request. - name: Pattern mode job token - patternModeMessage: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: patternModeMessage - description: Contains entities found from pattern mode or error message - name: Pattern mode message - linkedFile: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: linkedFile - description: File linked to annotation - name: Linked file - source: - externalId: {{ fileExternalId }} - space: {{ fileSchemaSpace }} - type: view - version: {{ fileVersion }} - name: - container: - externalId: CogniteDescribable - space: cdf_cdm - type: container - containerPropertyIdentifier: name - description: Name - name: Name - pageCount: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: pageCount - description: Total number of file pages - name: Page count - sourceCreatedTime: - container: - externalId: CogniteSourceable - space: cdf_cdm - type: container - containerPropertyIdentifier: sourceCreatedTime - description: Created time - name: Created time - sourceUpdatedTime: - container: - externalId: CogniteSourceable - space: cdf_cdm - type: container - containerPropertyIdentifier: sourceUpdatedTime - description: Last updated time - name: Last updated time - launchFunctionId: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: launchFunctionId - description: Id of the launch function that was called - name: Launch function Id - launchFunctionCallId: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: launchFunctionCallId - description: Specific Id that points to the function log that created the diagram detect job for the file - name: Launch function call Id - finalizeFunctionId: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: finalizeFunctionId - description: Id of the finalize function that was called - name: Finalize function Id - finalizeFunctionCallId: - container: - externalId: {{ annotationStateExternalId }} - space: {{ annotationStateSchemaSpace }} - type: container - containerPropertyIdentifier: finalizeFunctionCallId - description: Specific Id that points to the function log that applied annotations to the file - name: Finalize function call Id - space: {{ annotationStateSchemaSpace }} - version: {{ annotationStateVersion }} diff --git a/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/pattern.node.yaml b/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/pattern.node.yaml deleted file mode 100644 index 3afbbfc1..00000000 --- a/modules/accelerators/contextualization/cdf_file_annotation/data_modeling/pattern.node.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- space: {{patternModeInstanceSpace}} - externalId: {{patternDetectSink}} - sources: - - source: - space: cdf_cdm - externalId: CogniteFile # Using CogniteFile as a base type for simplicity - version: 'v1' - type: view - properties: - name: 'Pattern Detection Sink Node' - description: 'A single, static node used as the end target for all pattern detection edges. The actual detection details are stored on the edge itself.' diff --git a/modules/accelerators/contextualization/cdf_file_annotation/default.config.yaml b/modules/accelerators/contextualization/cdf_file_annotation/default.config.yaml index fe615df5..abfcd9e5 100644 --- a/modules/accelerators/contextualization/cdf_file_annotation/default.config.yaml +++ b/modules/accelerators/contextualization/cdf_file_annotation/default.config.yaml @@ -52,5 +52,5 @@ fileToAssetTransformationExternalId: tr_file_to_asset_from_annotations # used in /auth # Update GROUP_SOURCE_ID to your group source ID -groupSourceId: +groupSourceId: ${GROUP_SOURCE_ID} ApplicationOwner: # Update to your application owner email id(s) diff --git a/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_finalize/requirements.txt b/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_finalize/requirements.txt index b2d08d0d..8c215683 100644 --- a/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_finalize/requirements.txt +++ b/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_finalize/requirements.txt @@ -3,7 +3,7 @@ certifi==2025.4.26 cffi>=1.17.1 charset-normalizer==3.4.2 cognite-sdk==7.76.0 -cryptography==46.0.5 +cryptography==46.0.6 dotenv==0.9.9 idna==3.10 msal==1.32.3 @@ -16,7 +16,7 @@ pydantic_core==2.33.2 PyJWT==2.12.0 python-dotenv==1.1.0 PyYAML==6.0.2 -requests==2.32.4 +requests==2.33.0 requests-oauthlib==1.3.1 typing-inspection==0.4.0 typing_extensions==4.13.2 diff --git a/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_launch/requirements.txt b/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_launch/requirements.txt index b2d08d0d..8c215683 100644 --- a/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_launch/requirements.txt +++ b/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_launch/requirements.txt @@ -3,7 +3,7 @@ certifi==2025.4.26 cffi>=1.17.1 charset-normalizer==3.4.2 cognite-sdk==7.76.0 -cryptography==46.0.5 +cryptography==46.0.6 dotenv==0.9.9 idna==3.10 msal==1.32.3 @@ -16,7 +16,7 @@ pydantic_core==2.33.2 PyJWT==2.12.0 python-dotenv==1.1.0 PyYAML==6.0.2 -requests==2.32.4 +requests==2.33.0 requests-oauthlib==1.3.1 typing-inspection==0.4.0 typing_extensions==4.13.2 diff --git a/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_prepare/requirements.txt b/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_prepare/requirements.txt index e51471d0..15636eba 100644 --- a/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_prepare/requirements.txt +++ b/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_prepare/requirements.txt @@ -3,7 +3,7 @@ certifi==2025.4.26 cffi>=1.17.1 charset-normalizer==3.4.2 cognite-sdk==7.76.0 -cryptography==46.0.5 +cryptography==46.0.6 dotenv==0.9.9 idna==3.10 msal==1.32.3 @@ -16,7 +16,7 @@ pydantic_core==2.33.2 PyJWT==2.10.1 python-dotenv==1.1.0 PyYAML==6.0.2 -requests==2.32.4 +requests==2.33.0 requests-oauthlib==1.3.1 typing-inspection==0.4.0 typing_extensions==4.13.2 diff --git a/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_promote/requirements.txt b/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_promote/requirements.txt index faa4898a..22eafdb9 100644 --- a/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_promote/requirements.txt +++ b/modules/accelerators/contextualization/cdf_file_annotation/functions/fn_file_annotation_promote/requirements.txt @@ -3,7 +3,7 @@ certifi==2025.4.26 cffi>=1.17.1 charset-normalizer==3.4.2 cognite-sdk==7.76.0 -cryptography==46.0.5 +cryptography==46.0.6 dotenv==0.9.9 idna==3.10 msal==1.32.3 @@ -16,7 +16,7 @@ pydantic_core==2.33.2 PyJWT==2.12.0 python-dotenv==1.1.0 PyYAML==6.0.2 -requests==2.32.4 +requests==2.33.0 requests-oauthlib==1.3.1 typing-inspection==0.4.0 typing_extensions==4.13.2 diff --git a/modules/accelerators/open_industrial_data_sync/default.config.yaml b/modules/accelerators/open_industrial_data_sync/default.config.yaml index b8fb079c..7c59255e 100644 --- a/modules/accelerators/open_industrial_data_sync/default.config.yaml +++ b/modules/accelerators/open_industrial_data_sync/default.config.yaml @@ -1,7 +1,7 @@ oidDatasetExternalId: ds_oid_sync instanceSpace: springfield_instances # Update GROUP_SOURCE_ID to your group source ID -groupSourceId: +groupSourceId: ${GROUP_SOURCE_ID} functionClientId: ${IDP_CLIENT_ID} functionClientSecret: ${IDP_CLIENT_SECRET} extractionPipelineExternalId: ep_oid_sync diff --git a/modules/accelerators/open_industrial_data_sync/functions/fn_oid_sync.Function.yaml b/modules/accelerators/open_industrial_data_sync/functions/fn_oid_sync.Function.yaml index df9e6333..0cbe110d 100644 --- a/modules/accelerators/open_industrial_data_sync/functions/fn_oid_sync.Function.yaml +++ b/modules/accelerators/open_industrial_data_sync/functions/fn_oid_sync.Function.yaml @@ -5,8 +5,8 @@ functionPath: handler.py secrets: oid-secret: "{{openIdClientSecret}}" - cpu: 0.25 - memory: 1.0 + cpu: 1.0 + memory: 1.5 metadata: version: "v1.0.0" space: {{ functionSpace }} diff --git a/modules/dashboards/rpt_quality/default.config.yaml b/modules/dashboards/rpt_quality/default.config.yaml index d4c1807b..fc63826c 100644 --- a/modules/dashboards/rpt_quality/default.config.yaml +++ b/modules/dashboards/rpt_quality/default.config.yaml @@ -15,4 +15,4 @@ reservedWordPrefix: Enterprise_ # used in /auth # Update GROUP_SOURCE_ID to your group source ID -groupSourceId: \ No newline at end of file +groupSourceId: ${GROUP_SOURCE_ID} \ No newline at end of file diff --git a/modules/sourcesystem/cdf_pi/default.config.yaml b/modules/sourcesystem/cdf_pi/default.config.yaml index 8480bb9c..fc345345 100644 --- a/modules/sourcesystem/cdf_pi/default.config.yaml +++ b/modules/sourcesystem/cdf_pi/default.config.yaml @@ -8,7 +8,7 @@ datamodelVersion: v1 instanceSpace: springfield_instances rawSourceDatabase: ingestion reservedWordPrefix: Enterprise_ -groupSourceId: +groupSourceId: ${GROUP_SOURCE_ID} workflow: aveva_pi_population # TODO: Update to use the actual client ID and secret 'workflowClientId: ${AVEVA_PI_SPRINGFIELD_CLIENT_ID} & workflowClientSecret: ${AVEVA_PI_SPRINGFIELD_CLIENT_SECRET}' workflowClientId: ${IDP_CLIENT_ID} diff --git a/modules/sourcesystem/cdf_sap_assets/default.config.yaml b/modules/sourcesystem/cdf_sap_assets/default.config.yaml index 8e3d7e4a..f7d4fcb8 100644 --- a/modules/sourcesystem/cdf_sap_assets/default.config.yaml +++ b/modules/sourcesystem/cdf_sap_assets/default.config.yaml @@ -10,7 +10,7 @@ datamodelVersion: v1 instanceSpace: springfield_instances rawSourceDatabase: ingestion -groupSourceId: +groupSourceId: ${GROUP_SOURCE_ID} workflow: sap_s4hana_population # TODO: Update to use the actual client ID and secret 'workflowClientId: ${SAP_SPRINGFIELD_S4HANA_CLIENT_ID} & workflowClientSecret: ${SAP_SPRINGFIELD_S4HANA_CLIENT_SECRET}' workflowClientId: ${IDP_CLIENT_ID} diff --git a/modules/sourcesystem/cdf_sap_events/default.config.yaml b/modules/sourcesystem/cdf_sap_events/default.config.yaml index d316af23..eb5e9226 100644 --- a/modules/sourcesystem/cdf_sap_events/default.config.yaml +++ b/modules/sourcesystem/cdf_sap_events/default.config.yaml @@ -11,7 +11,7 @@ instanceSpace: springfield_instances rawSourceDatabase: ingestion workflow: sap_s4hana_population_events -groupSourceId: +groupSourceId: ${GROUP_SOURCE_ID} # TODO: Update to use the actual client ID and secret 'workflowClientId: ${SAP_SPRINGFIELD_S4HANA_CLIENT_ID} & workflowClientSecret: ${SAP_SPRINGFIELD_S4HANA_CLIENT_SECRET}' workflowClientId: ${IDP_CLIENT_ID} workflowClientSecret: ${IDP_CLIENT_SECRET} diff --git a/modules/sourcesystem/cdf_sharepoint/default.config.yaml b/modules/sourcesystem/cdf_sharepoint/default.config.yaml index 9da6b3bf..91d56492 100644 --- a/modules/sourcesystem/cdf_sharepoint/default.config.yaml +++ b/modules/sourcesystem/cdf_sharepoint/default.config.yaml @@ -7,7 +7,7 @@ datamodelVersion: v1 instanceSpace: springfield_instances rawSourceDatabase: ingestion -groupSourceId: +groupSourceId: ${GROUP_SOURCE_ID} workflow: files_metadata_population # TODO: Update to use the actual client ID and secret 'workflowClientId: ${SHAREPOINT_SERVICE_PRINCIPAL_CLIENT_ID} & workflowClientSecret: ${SHAREPOINT_SERVICE_PRINCIPAL_CLIENT_SECRET}' workflowClientId: ${IDP_CLIENT_ID} diff --git a/modules/sourcesystem/cdf_sharepoint/files/upload.CogniteFile.yaml b/modules/sourcesystem/cdf_sharepoint/files/upload.CogniteFile.yaml deleted file mode 100644 index a34e0b09..00000000 --- a/modules/sourcesystem/cdf_sharepoint/files/upload.CogniteFile.yaml +++ /dev/null @@ -1,44 +0,0 @@ -- externalId: VAL_PH-25578-P-4110006-001.pdf - space: {{ instanceSpace }} - name: PH-25578-P-4110006-001.pdf - mimeType: application/pdf -- externalId: VAL_PH-25578-P-4110010-001.pdf - space: {{ instanceSpace }} - name: PH-25578-P-4110010-001.pdf - mimeType: application/pdf -- externalId: VAL_PH-25578-P-4110119-001.pdf - space: {{ instanceSpace }} - name: PH-25578-P-4110119-001.pdf - mimeType: application/pdf -- externalId: VAL_PH-ME-P-0003-001.pdf - space: {{ instanceSpace }} - name: PH-ME-P-0003-001.pdf - mimeType: application/pdf -- externalId: VAL_PH-ME-P-0004-001.pdf - space: {{ instanceSpace }} - name: PH-ME-P-0004-001.pdf - mimeType: application/pdf -- externalId: VAL_PH-ME-P-0151-001.pdf - space: {{ instanceSpace }} - name: PH-ME-P-0151-001.pdf - mimeType: application/pdf -- externalId: VAL_PH-ME-P-0152-001.pdf - space: {{ instanceSpace }} - name: PH-ME-P-0152-001.pdf - mimeType: application/pdf -- externalId: VAL_PH-ME-P-0153-001.pdf - space: {{ instanceSpace }} - name: PH-ME-P-0153-001.pdf - mimeType: application/pdf -- externalId: VAL_PH-ME-P-0156-001.pdf - space: {{ instanceSpace }} - name: PH-ME-P-0156-001.pdf - mimeType: application/pdf -- externalId: VAL_PH-ME-P-0156-002.pdf - space: {{ instanceSpace }} - name: PH-ME-P-0156-002.pdf - mimeType: application/pdf -- externalId: VAL_PH-ME-P-0160-001.pdf - space: {{ instanceSpace }} - name: PH-ME-P-0160-001.pdf - mimeType: application/pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-25578-P-4110006-001.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-25578-P-4110006-001.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-25578-P-4110006-001.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-25578-P-4110006-001.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-25578-P-4110010-001.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-25578-P-4110010-001.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-25578-P-4110010-001.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-25578-P-4110010-001.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-25578-P-4110119-001.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-25578-P-4110119-001.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-25578-P-4110119-001.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-25578-P-4110119-001.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0003-001.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0003-001.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0003-001.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0003-001.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0004-001.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0004-001.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0004-001.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0004-001.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0151-001.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0151-001.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0151-001.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0151-001.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0152-001.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0152-001.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0152-001.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0152-001.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0153-001.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0153-001.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0153-001.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0153-001.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0156-001.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0156-001.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0156-001.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0156-001.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0156-002.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0156-002.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0156-002.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0156-002.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0160-001.pdf b/modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0160-001.pdf similarity index 100% rename from modules/sourcesystem/cdf_sharepoint/files/PH-ME-P-0160-001.pdf rename to modules/sourcesystem/cdf_sharepoint/upload_data/p&ids/PH-ME-P-0160-001.pdf diff --git a/modules/sourcesystem/cdf_sharepoint/upload_data/pidFiles.Manifest.yaml b/modules/sourcesystem/cdf_sharepoint/upload_data/pidFiles.Manifest.yaml new file mode 100644 index 00000000..8c472373 --- /dev/null +++ b/modules/sourcesystem/cdf_sharepoint/upload_data/pidFiles.Manifest.yaml @@ -0,0 +1,12 @@ +kind: FileContent +type: fileDataModelingTemplate +fileDirectory: ./p&ids +viewId: + space: cdf_cdm + externalId: CogniteFile + version: v1 +template: + instanceId: + space: springfield_instances + externalId: VAL_$FILENAME + name: $FILENAME \ No newline at end of file diff --git a/packages.zip b/packages.zip new file mode 100644 index 00000000..5015c3ea Binary files /dev/null and b/packages.zip differ