Skip to content

feat(workers): Add optional ID when resolving secrets #881

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
hemalshah-gradientedge merged 1 commit into from
Aug 4, 2025
Merged

feat(workers): Add optional ID when resolving secrets #881

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions src/lib/cloudflare/construct/worker-site/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
protected createWorkerDomain() {
this.workerManager.createWorkerDomain(`${this.id}-worker-domain`, this, {
...this.props.siteWorkerDomain,
environment: this.props.siteWorkerDomain.environment ?? 'production',
hostname: `${this.props.siteSubDomain}.${this.props.domainName}`,
service: this.siteWorkerScript.scriptName,
})
Expand All @@ -107,15 +108,21 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
* @param secretKey the secret key
* @returns the secret value
*/
protected resolveSecretFromAWS(secretName: string, secretKey: string) {
protected resolveSecretFromAWS(secretName: string, secretKey: string, id?: string) {
if (!this.awsProvider) {
throw new Error(`Unable to resolve secret:${secretKey}. AWS provider not found`)
}
const secret = new DataAwsSecretsmanagerSecret(this, `${this.id}-${secretName}-${secretKey}`, { name: secretName })
const secretVersion = new DataAwsSecretsmanagerSecretVersion(this, `${this.id}-${secretName}-${secretKey}-ver`, {
provider: this.awsProvider,
secretId: secret.id,
const secret = new DataAwsSecretsmanagerSecret(this, id ?? `${this.id}-${secretName}-${secretKey}`, {
name: secretName,
})
const secretVersion = new DataAwsSecretsmanagerSecretVersion(
this,
id ? `${id}-ver` : `${this.id}-${secretName}-${secretKey}-ver`,
{
provider: this.awsProvider,
secretId: secret.id,
}
)
if (!secretVersion) throw new Error(`Unable to resolve secret:${secretName}`)
return Fn.lookup(Fn.jsondecode(secretVersion.secretString), secretKey)
}
Expand All @@ -128,13 +135,13 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
* @param secretKey the secret key
* @returns the secret value
*/
protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string) {
protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string, id?: string) {
if (!this.azurermProvider) {
throw new Error(`Unable to resolve secret:${secretKey}. Azurerm provider not found`)
}
const keyVaultData = new DataAzurermKeyVault(
this,
`${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-vault`,
id ? `${id}-vault` : `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-vault`,
{
resourceGroupName: resourceGroupName,
name: keyVaultName,
Expand All @@ -143,7 +150,7 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
)
const secretValueData = new DataAzurermKeyVaultSecret(
this,
`${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-secret`,
id ? `${id}-secret` : `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-secret`,
{
name: secretKey,
keyVaultId: keyVaultData.id,
Expand Down