Skip to content

Dr.Egeria Postgres element commands take a secrets store (ISSUE-160 follow-up) #478

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.

Sign up for GitHub

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

Merged
dwolfson merged 2 commits into from
Oct 22, 2026
Merged

Dr.Egeria Postgres element commands take a secrets store (ISSUE-160 follow-up) #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77028f2
Dr.Egeria Postgres element commands take a secrets store (ISSUE-160 f…
dwolfson Oct 22, 2026
199ed83
Merge branch 'main' into claude/elegant-chatterjee-d280de
dwolfson Oct 22, 2026
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
2 changes: 1 addition & 1 deletion PYEGERIA_ISSUES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ Tests: `tests/micro-tests/test_issue_160_template_placeholders.py` (5 cases; all
Each is a new optional parameter on the async method and its sync wrapper.
- **Item 4 needed no change:** "Keystore File" is a real template (`DataAssetTemplateDefinition.KEYSTORE_FILE_TEMPLATE`), and live, both "YAML File Secrets Collection" and "Keystore File" resolve to template `fbcfcc0c`.

Tests: `tests/micro-tests/test_issue_160_remaining_placeholders.py`, 11 cases, all failing on #474's code. The full micro-test suite (1,420) passes in a clean python:3.13-slim container. **Follow-up not in this fix:** Dr.Egeria's `Postgres Server Element` / `Postgres Database Element` commands still pass `Database User Id` / `Database Password`. Those are now ignored with a warning; their compact specs need `Secrets Store Path Name` / `Secrets Collection Name` attributes.
Tests: `tests/micro-tests/test_issue_160_remaining_placeholders.py`, 11 cases, all failing on #474's code. The full micro-test suite (1,420) passes in a clean python:3.13-slim container. **Dr.Egeria follow-up, done 2026-10-21** (after 6.2.8; branch `claude/elegant-chatterjee-d280de`): the `Create Postgres Server Element` / `Create Postgres Database Element` commands no longer offer `Database User Id` / `Database Password`. Both attributes were deleted from the Asset Maker compact spec, since no other command used them. The commands now offer `Secrets Store Path Name`, `Secrets Collection Name` and `Version Identifier`, and the server also offers `Resource Name` (the canonical Governance Officer definition, copied). `AssetMakerProcessor` passes them as `secrets_store_path_name` / `secrets_collection_name` / `version` / `resource_name` and no longer passes `db_user` / `db_pwd`. Templates, help and report specs were regenerated, and the templates were copied to egeria-workspaces and trellis on local branches. Test: `tests/micro-tests/test_postgres_element_secrets.py`. Not run against a live server.

**Follow-up live check 2026-10-21 15:16Z** (Egeria `main` 05a5e982, erinoverview, after a peer round; #475 code):
- **(a)** `create_postgres_server_element_from_template("pyeg_rt_pg_…", "pyeg-rt.invalid", "5432", secrets_store_path_name=…, secrets_collection_name=…)`, with no `db_user` / `db_pwd`, created SoftwareServer `b6b2ebff`: `resourceName` = the server name, `versionIdentifier` and `description` = `""`, and no `~{...}~` in its own properties. Its Connection `55686913` and Endpoint `59014065` (`jdbc:postgresql://pyeg-rt.invalid:5432/postgres`) had no literals either.
Expand Down
110 changes: 66 additions & 44 deletions md_processing/data/compact_commands/commands_asset_maker_compact.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,44 +173,6 @@
"level": "Basic",
"Journal Entry": "Added 2026-09-11 -- Asset Maker family (Create Element from Automated Curation)."
},
"Database User Id": {
"variable_name": "db_user",
"inUpdate": false,
"attr_labels": "",
"examples": "",
"default_value": "",
"valid_values": [],
"existing_element": "",
"description": "User id used to connect to the database server.",
"generated": false,
"style": "Simple",
"user_specified": true,
"unique": false,
"input_required": false,
"min_cardinality": 0,
"max_cardinality": 1,
"level": "Basic",
"Journal Entry": "Added 2026-09-11 -- Asset Maker family (Create Element from Automated Curation)."
},
"Database Password": {
"variable_name": "db_pwd",
"inUpdate": false,
"attr_labels": "",
"examples": "",
"default_value": "",
"valid_values": [],
"existing_element": "",
"description": "Password used to connect to the database server.",
"generated": false,
"style": "Simple",
"user_specified": true,
"unique": false,
"input_required": false,
"min_cardinality": 0,
"max_cardinality": 1,
"level": "Basic",
"Journal Entry": "Added 2026-09-11 -- Asset Maker family (Create Element from Automated Curation)."
},
"File Path Name": {
"variable_name": "file_path_name",
"inUpdate": false,
Expand Down Expand Up @@ -566,6 +528,63 @@
"max_cardinality": 1,
"level": "Basic",
"Journal Entry": "Added 2026-09-11 -- Asset Maker family (Create Element from Automated Curation)."
},
"Secrets Store Path Name": {
"inUpdate": false,
"attr_labels": "",
"examples": "",
"default_value": "",
"valid_values": [],
"existing_element": "",
"generated": false,
"style": "Simple",
"user_specified": true,
"unique": false,
"input_required": false,
"min_cardinality": 0,
"max_cardinality": 1,
"level": "Basic",
"Journal Entry": "Added 2026-10-21 -- ISSUE-160 follow-up: Egeria's Postgres templates take credentials from a secrets store (pyegeria 6.2.8).",
"variable_name": "secrets_store_path_name",
"description": "Path name of the secrets store file that holds the credentials used to connect to the database server (secretsStorePathName)."
},
"Secrets Collection Name": {
"inUpdate": false,
"attr_labels": "",
"examples": "",
"default_value": "",
"valid_values": [],
"existing_element": "",
"generated": false,
"style": "Simple",
"user_specified": true,
"unique": false,
"input_required": false,
"min_cardinality": 0,
"max_cardinality": 1,
"level": "Basic",
"Journal Entry": "Added 2026-10-21 -- ISSUE-160 follow-up: Egeria's Postgres templates take credentials from a secrets store (pyegeria 6.2.8).",
"variable_name": "secrets_collection_name",
"description": "Name of the collection within the secrets store that holds the credentials for this connection (secretsCollectionName)."
},
"Resource Name": {
"variable_name": "resource_name",
"inUpdate": true,
"attr_labels": "",
"examples": "",
"default_value": "",
"valid_values": [],
"existing_element": "",
"description": "Name of a resource.",
"generated": false,
"style": "Simple",
"user_specified": true,
"unique": false,
"input_required": false,
"min_cardinality": 0,
"max_cardinality": 1,
"level": "Domain",
"Journal Entry": ""
}
},
"bundles": {
Expand Down Expand Up @@ -675,11 +694,13 @@
"Postgres Server Name",
"Host Name",
"Port",
"Database User Id",
"Database Password",
"Secrets Store Path Name",
"Secrets Collection Name",
"Resource Name",
"Version Identifier",
"Description"
],
"Journal Entry": "Added 2026-09-11 -- Asset Maker family, wraps automated_curation.py's create-element-from-template methods. OM_TYPE is best-effort (not yet confirmed against a live server's type system); create-only (no Update) since the underlying OMVS methods have no update counterpart."
"Journal Entry": "Added 2026-09-11 -- Asset Maker family, wraps automated_curation.py's create-element-from-template methods. OM_TYPE is best-effort (not yet confirmed against a live server's type system); create-only (no Update) since the underlying OMVS methods have no update counterpart. Updated 2026-10-21 (ISSUE-160 follow-up): Database User Id / Database Password replaced by Secrets Store Path Name / Secrets Collection Name; Version Identifier added (and Resource Name on the server)."
},
"Create Postgres Database Element": {
"display_name": "Postgres Database Element",
Expand All @@ -702,11 +723,12 @@
"Postgres Server Name",
"Host Name",
"Port",
"Database User Id",
"Database Password",
"Secrets Store Path Name",
"Secrets Collection Name",
"Version Identifier",
"Description"
],
"Journal Entry": "Added 2026-09-11 -- Asset Maker family, wraps automated_curation.py's create-element-from-template methods. OM_TYPE is best-effort (not yet confirmed against a live server's type system); create-only (no Update) since the underlying OMVS methods have no update counterpart."
"Journal Entry": "Added 2026-09-11 -- Asset Maker family, wraps automated_curation.py's create-element-from-template methods. OM_TYPE is best-effort (not yet confirmed against a live server's type system); create-only (no Update) since the underlying OMVS methods have no update counterpart. Updated 2026-10-21 (ISSUE-160 follow-up): Database User Id / Database Password replaced by Secrets Store Path Name / Secrets Collection Name; Version Identifier added (and Resource Name on the server)."
},
"Create Folder Element": {
"display_name": "Folder Element",
Expand Down
Loading
Loading