Skip to content

Commit 232b627

Browse files
authored
connectors-ci: unique secret name at session level (#28656)
1 parent 66b428b commit 232b627

File tree

1 file changed

+6
-3
lines changed
  • tools/ci_connector_ops/ci_connector_ops/pipelines/actions

1 file changed

+6
-3
lines changed

tools/ci_connector_ops/ci_connector_ops/pipelines/actions/secrets.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ async def download(context: ConnectorContext, gcp_gsm_env_variable_name: str = "
5858
connector_secrets = {}
5959
for secret_file in await with_downloaded_secrets.directory(secrets_path).entries():
6060
secret_plaintext = await with_downloaded_secrets.directory(secrets_path).file(secret_file).contents()
61-
connector_secrets[secret_file] = context.dagger_client.set_secret(secret_file, secret_plaintext)
61+
# We have to namespace secrets as Dagger derives session wide secret ID from their name
62+
unique_secret_name = f"{context.connector.technical_name}_{secret_file}"
63+
connector_secrets[secret_file] = context.dagger_client.set_secret(unique_secret_name, secret_plaintext)
6264

6365
return connector_secrets
6466

@@ -82,8 +84,9 @@ async def upload(context: ConnectorContext, gcp_gsm_env_variable_name: str = "GC
8284
ci_credentials = await environments.with_ci_credentials(context, gsm_secret)
8385

8486
return await (
85-
ci_credentials.with_directory(secrets_path, context.updated_secrets_dir)
86-
.with_exec(["ci_credentials", context.connector.technical_name, "update-secrets"])
87+
ci_credentials.with_directory(secrets_path, context.updated_secrets_dir).with_exec(
88+
["ci_credentials", context.connector.technical_name, "update-secrets"]
89+
)
8790
)
8891

8992

0 commit comments

Comments
 (0)