Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated infield standard config to latest changes #822

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ Changes are grouped as follows:
- `Fixed` for any bug fixes.
- `Security` in case of vulnerabilities.

## TBD

### Changed

- Updated Infield reference module to use the new Infield config format where location config is done by location

## [0.2.17] - 2024-07-26

No changes to templates.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
applicationsconfiguration_source_id: <change_me>
apm_config_instance_space: 'APM_Config'
applicationsconfiguration_source_id: <change_me>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This role is identical to the normal users, but is used to group user with additional InField feature capabilities for checklist admins.
# Typical Team captain / Supervisor users
name: 'gp_infield_{{first_location}}_checklist_admins'
name: 'gp_infield_{{location}}_checklist_admins'
sourceId: '{{infield_location_checklist_admin_users_source_id}}'
metadata:
origin: 'cdf-project-templates'
Expand All @@ -17,49 +17,49 @@ capabilities:
- READ
scope:
datasetScope: {
ids: ['ds_3d_{{first_location}}']
ids: ['ds_3d_{{location}}']
}
- assetsAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_asset_{{first_location}}']
ids: ['ds_asset_{{location}}']
}
- filesAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_files_{{first_location}}', 'ds_infield_{{first_location}}_app_data']
ids: ['ds_files_{{location}}', 'ds_infield_{{location}}_app_data']
}
- filesAcl:
actions:
- WRITE
scope:
datasetScope: {
ids: ['ds_infield_{{first_location}}_app_data']
ids: ['ds_infield_{{location}}_app_data']
}
- relationshipsAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_relationships_{{first_location}}']
ids: ['ds_relationships_{{location}}']
}
- timeSeriesAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_timeseries_{{first_location}}', 'ds_infield_{{first_location}}_app_data']
ids: ['ds_timeseries_{{location}}', 'ds_infield_{{location}}_app_data']
}
- timeSeriesAcl:
actions:
- WRITE
scope:
datasetScope: {
ids: ['ds_infield_{{first_location}}_app_data']
ids: ['ds_infield_{{location}}_app_data']
}
- dataModelsAcl:
actions:
Expand All @@ -83,9 +83,9 @@ capabilities:
spaceIds: [
'APM_Config',
'cdf_apm',
'cognite_app_data', # this space must be created to store user profile information
'sp_asset_{{first_location}}_source', # from modules/config.yaml
'sp_infield_{{first_location}}_app_data' # from modules/config.yaml
'cognite_app_data', # this space must be created to store user profile and app config information
'sp_asset_{{location}}_source', # from modules/config.yaml
'sp_infield_{{location}}_app_data' # from modules/config.yaml
]
}
- dataModelInstancesAcl:
Expand All @@ -95,6 +95,6 @@ capabilities:
spaceIdScope: {
spaceIds: [
'cognite_app_data', # this space must be created to store user profile information
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'cognite_app_data', # this space must be created to store user profile information
'cognite_app_data', # this space must be created to store user profile information
'cognite_app_config_data', # this space must be created to store config data

'sp_infield_{{first_location}}_app_data' # from modules/config.yaml
'sp_infield_{{location}}_app_data' # from modules/config.yaml
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Role has additional write permissions to app data dataset and spaces and is the Normal InField user that can execute on checklists.
# Typical Technician user
name: 'gp_infield_{{first_location}}_normal_users'
name: 'gp_infield_{{location}}_normal_users'
sourceId: '{{infield_location_normal_users_source_id}}'
metadata:
origin: 'cdf-project-templates'
Expand All @@ -17,49 +17,49 @@ capabilities:
- READ
scope:
datasetScope: {
ids: ['ds_3d_{{first_location}}']
ids: ['ds_3d_{{location}}']
}
- assetsAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_asset_{{first_location}}']
ids: ['ds_asset_{{location}}']
}
- filesAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_files_{{first_location}}', 'ds_infield_{{first_location}}_app_data']
ids: ['ds_files_{{location}}', 'ds_infield_{{location}}_app_data']
}
- filesAcl:
actions:
- WRITE
scope:
datasetScope: {
ids: ['ds_infield_{{first_location}}_app_data']
ids: ['ds_infield_{{location}}_app_data']
}
- relationshipsAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_relationships_{{first_location}}']
ids: ['ds_relationships_{{location}}']
}
- timeSeriesAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_timeseries_{{first_location}}', 'ds_infield_{{first_location}}_app_data']
ids: ['ds_timeseries_{{location}}', 'ds_infield_{{location}}_app_data']
}
- timeSeriesAcl:
actions:
- WRITE
scope:
datasetScope: {
ids: ['ds_infield_{{first_location}}_app_data']
ids: ['ds_infield_{{location}}_app_data']
}
- dataModelsAcl:
actions:
Expand All @@ -84,8 +84,8 @@ capabilities:
'APM_Config',
'cdf_apm',
'cognite_app_data', # this space must be created to store user profile information
'sp_asset_{{first_location}}_source', # from modules/config.yaml
'sp_infield_{{first_location}}_app_data' # from modules/config.yaml
'sp_asset_{{location}}_source', # from modules/config.yaml
'sp_infield_{{location}}_app_data' # from modules/config.yaml
]
}
- dataModelInstancesAcl:
Expand All @@ -95,6 +95,6 @@ capabilities:
spaceIdScope: {
spaceIds: [
'cognite_app_data', # this space must be created to store user profile information
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'cognite_app_data', # this space must be created to store user profile information
'cognite_app_data', # this space must be created to store user profile information
'cognite_app_config_data', # this space must be created to store config data

'sp_infield_{{first_location}}_app_data' # from modules/config.yaml
'sp_infield_{{location}}_app_data' # from modules/config.yaml
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This role is identical to the normal users, but is used to group user with additional InField feature capabilities for template admins.
# Typical Learning facilitators / Supervisor / maintenance planner users
name: 'gp_infield_{{first_location}}_template_admins'
name: 'gp_infield_{{location}}_template_admins'
sourceId: '{{infield_location_template_admin_users_source_id}}'
metadata:
origin: 'cdf-project-templates'
Expand All @@ -17,49 +17,49 @@ capabilities:
- READ
scope:
datasetScope: {
ids: ['ds_3d_{{first_location}}']
ids: ['ds_3d_{{location}}']
}
- assetsAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_asset_{{first_location}}']
ids: ['ds_asset_{{location}}']
}
- filesAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_files_{{first_location}}', 'ds_infield_{{first_location}}_app_data']
ids: ['ds_files_{{location}}', 'ds_infield_{{location}}_app_data']
}
- filesAcl:
actions:
- WRITE
scope:
datasetScope: {
ids: ['ds_infield_{{first_location}}_app_data']
ids: ['ds_infield_{{location}}_app_data']
}
- relationshipsAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_relationships_{{first_location}}']
ids: ['ds_relationships_{{location}}']
}
- timeSeriesAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_timeseries_{{first_location}}', 'ds_infield_{{first_location}}_app_data']
ids: ['ds_timeseries_{{location}}', 'ds_infield_{{location}}_app_data']
}
- timeSeriesAcl:
actions:
- WRITE
scope:
datasetScope: {
ids: ['ds_infield_{{first_location}}_app_data']
ids: ['ds_infield_{{location}}_app_data']
}
- dataModelsAcl:
actions:
Expand All @@ -84,8 +84,8 @@ capabilities:
'APM_Config',
'cdf_apm',
'cognite_app_data', # this space must be created to store user profile information
'sp_asset_{{first_location}}_source', # from modules/config.yaml
'sp_infield_{{first_location}}_app_data' # from modules/config.yaml
'sp_asset_{{location}}_source', # from modules/config.yaml
'sp_infield_{{location}}_app_data' # from modules/config.yaml
]
}
- dataModelInstancesAcl:
Expand All @@ -95,6 +95,6 @@ capabilities:
spaceIdScope: {
spaceIds: [
'cognite_app_data', # this space must be created to store user profile information
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'cognite_app_data', # this space must be created to store user profile information
'cognite_app_data', # this space must be created to store user profile information
'cognite_app_config_data', # this space must be created to store config data

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also add it to the read only group, didnt have the option to suggest it.

'sp_infield_{{first_location}}_app_data' # from modules/config.yaml
'sp_infield_{{location}}_app_data' # from modules/config.yaml
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This role has only viewer capabilities in InField and cannot create data like templates, checklist, images etc.
# Typical Reliability users or other business users.
name: 'gp_infield_{{first_location}}_viewers'
name: 'gp_infield_{{location}}_viewers'
sourceId: '{{infield_location_viewer_users_source_id}}'
metadata:
origin: 'cdf-project-templates'
Expand All @@ -17,35 +17,35 @@ capabilities:
- READ
scope:
datasetScope: {
ids: ['ds_3d_{{first_location}}']
ids: ['ds_3d_{{location}}']
}
- assetsAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_asset_{{first_location}}']
ids: ['ds_asset_{{location}}']
}
- filesAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_files_{{first_location}}', 'ds_infield_{{first_location}}_app_data']
ids: ['ds_files_{{location}}', 'ds_infield_{{location}}_app_data']
}
- relationshipsAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_relationships_{{first_location}}']
ids: ['ds_relationships_{{location}}']
}
- timeSeriesAcl:
actions:
- READ
scope:
datasetScope: {
ids: ['ds_timeseries_{{first_location}}', 'ds_infield_{{first_location}}_app_data']
ids: ['ds_timeseries_{{location}}', 'ds_infield_{{location}}_app_data']
}
- dataModelsAcl:
actions:
Expand All @@ -70,8 +70,8 @@ capabilities:
'APM_Config',
'cdf_apm',
'cognite_app_data', # this space must be created to store user profile information
'sp_asset_{{first_location}}_source', # from modules/config.yaml
'sp_infield_{{first_location}}_app_data' # from modules/config.yaml
'sp_asset_{{location}}_source', # from modules/config.yaml
'sp_infield_{{location}}_app_data' # from modules/config.yaml
]
}
- dataModelInstancesAcl:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
space: sp_infield_{{first_location}}_app_data
name: sp:infield:{{first_location}}:app_data
space: sp_infield_{{location}}_app_data
name: sp:infield:{{location}}:app_data
description: Space for Infield Location App Data
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
space: sp_asset_{{first_location}}_source
name: sp:infield:{{first_location}}:source
space: sp_asset_{{location}}_source
name: sp:infield:{{location}}:source
description: Space for Infield Location Source Data
Loading