@gradientedge/cdk-utils 9.74.1 → 9.76.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -52,7 +52,7 @@ export declare class CloudflareWorkerSite extends CommonCloudflareConstruct {
|
|
|
52
52
|
* @param secretKey the secret key
|
|
53
53
|
* @returns the secret value
|
|
54
54
|
*/
|
|
55
|
-
protected resolveSecretFromAWS(secretName: string, secretKey: string): any;
|
|
55
|
+
protected resolveSecretFromAWS(secretName: string, secretKey: string, id?: string): any;
|
|
56
56
|
/**
|
|
57
57
|
* @summary Resolve secrets from Azure Key Vault
|
|
58
58
|
*
|
|
@@ -61,7 +61,7 @@ export declare class CloudflareWorkerSite extends CommonCloudflareConstruct {
|
|
|
61
61
|
* @param secretKey the secret key
|
|
62
62
|
* @returns the secret value
|
|
63
63
|
*/
|
|
64
|
-
protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string): string;
|
|
64
|
+
protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string, id?: string): string;
|
|
65
65
|
/**
|
|
66
66
|
* @summary Create the rules
|
|
67
67
|
*/
|
|
@@ -83,6 +83,7 @@ class CloudflareWorkerSite extends common_1.CommonCloudflareConstruct {
|
|
|
83
83
|
createWorkerDomain() {
|
|
84
84
|
this.workerManager.createWorkerDomain(`${this.id}-worker-domain`, this, {
|
|
85
85
|
...this.props.siteWorkerDomain,
|
|
86
|
+
environment: this.props.siteWorkerDomain.environment ?? 'production',
|
|
86
87
|
hostname: `${this.props.siteSubDomain}.${this.props.domainName}`,
|
|
87
88
|
service: this.siteWorkerScript.scriptName,
|
|
88
89
|
});
|
|
@@ -93,12 +94,14 @@ class CloudflareWorkerSite extends common_1.CommonCloudflareConstruct {
|
|
|
93
94
|
* @param secretKey the secret key
|
|
94
95
|
* @returns the secret value
|
|
95
96
|
*/
|
|
96
|
-
resolveSecretFromAWS(secretName, secretKey) {
|
|
97
|
+
resolveSecretFromAWS(secretName, secretKey, id) {
|
|
97
98
|
if (!this.awsProvider) {
|
|
98
99
|
throw new Error(`Unable to resolve secret:${secretKey}. AWS provider not found`);
|
|
99
100
|
}
|
|
100
|
-
const secret = new data_aws_secretsmanager_secret_1.DataAwsSecretsmanagerSecret(this, `${this.id}-${secretName}-${secretKey}`, {
|
|
101
|
-
|
|
101
|
+
const secret = new data_aws_secretsmanager_secret_1.DataAwsSecretsmanagerSecret(this, id ?? `${this.id}-${secretName}-${secretKey}`, {
|
|
102
|
+
name: secretName,
|
|
103
|
+
});
|
|
104
|
+
const secretVersion = new data_aws_secretsmanager_secret_version_1.DataAwsSecretsmanagerSecretVersion(this, id ? `${id}-ver` : `${this.id}-${secretName}-${secretKey}-ver`, {
|
|
102
105
|
provider: this.awsProvider,
|
|
103
106
|
secretId: secret.id,
|
|
104
107
|
});
|
|
@@ -114,16 +117,16 @@ class CloudflareWorkerSite extends common_1.CommonCloudflareConstruct {
|
|
|
114
117
|
* @param secretKey the secret key
|
|
115
118
|
* @returns the secret value
|
|
116
119
|
*/
|
|
117
|
-
resolveSecretFromAzure(resourceGroupName, keyVaultName, secretKey) {
|
|
120
|
+
resolveSecretFromAzure(resourceGroupName, keyVaultName, secretKey, id) {
|
|
118
121
|
if (!this.azurermProvider) {
|
|
119
122
|
throw new Error(`Unable to resolve secret:${secretKey}. Azurerm provider not found`);
|
|
120
123
|
}
|
|
121
|
-
const keyVaultData = new data_azurerm_key_vault_1.DataAzurermKeyVault(this, `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-vault`, {
|
|
124
|
+
const keyVaultData = new data_azurerm_key_vault_1.DataAzurermKeyVault(this, id ? `${id}-vault` : `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-vault`, {
|
|
122
125
|
resourceGroupName: resourceGroupName,
|
|
123
126
|
name: keyVaultName,
|
|
124
127
|
provider: this.azurermProvider,
|
|
125
128
|
});
|
|
126
|
-
const secretValueData = new data_azurerm_key_vault_secret_1.DataAzurermKeyVaultSecret(this, `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-secret`, {
|
|
129
|
+
const secretValueData = new data_azurerm_key_vault_secret_1.DataAzurermKeyVaultSecret(this, id ? `${id}-secret` : `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-secret`, {
|
|
127
130
|
name: secretKey,
|
|
128
131
|
keyVaultId: keyVaultData.id,
|
|
129
132
|
provider: this.azurermProvider,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gradientedge/cdk-utils",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.76.0",
|
|
4
4
|
"description": "Utilities for AWS CDK provisioning",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"engines": {
|
|
@@ -51,12 +51,12 @@
|
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"@aws-sdk/client-secrets-manager": "^3.817.0",
|
|
54
|
-
"@aws-sdk/credential-providers": "^3.
|
|
54
|
+
"@aws-sdk/credential-providers": "^3.886.0",
|
|
55
55
|
"@aws-sdk/types": "^3.804.0",
|
|
56
56
|
"@cdktf/provider-aws": "^19.63.0",
|
|
57
|
-
"@cdktf/provider-azurerm": "^14.
|
|
58
|
-
"@cdktf/provider-cloudflare": "^13.
|
|
59
|
-
"@types/lodash": "^4.17.
|
|
57
|
+
"@cdktf/provider-azurerm": "^14.12.0",
|
|
58
|
+
"@cdktf/provider-cloudflare": "^13.4.0",
|
|
59
|
+
"@types/lodash": "^4.17.20",
|
|
60
60
|
"@types/node": "^22.15.17",
|
|
61
61
|
"@types/uuid": "^10.0.0",
|
|
62
62
|
"app-root-path": "^3.1.0",
|
|
@@ -72,8 +72,8 @@
|
|
|
72
72
|
"uuid": "^11.1.0"
|
|
73
73
|
},
|
|
74
74
|
"devDependencies": {
|
|
75
|
-
"@babel/core": "^7.
|
|
76
|
-
"@babel/eslint-parser": "^7.
|
|
75
|
+
"@babel/core": "^7.28.4",
|
|
76
|
+
"@babel/eslint-parser": "^7.28.4",
|
|
77
77
|
"@babel/plugin-proposal-class-properties": "^7.18.6",
|
|
78
78
|
"@eslint/config-array": "^0.20.0",
|
|
79
79
|
"@eslint/object-schema": "^2.1.6",
|
|
@@ -96,6 +96,7 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
|
|
|
96
96
|
protected createWorkerDomain() {
|
|
97
97
|
this.workerManager.createWorkerDomain(`${this.id}-worker-domain`, this, {
|
|
98
98
|
...this.props.siteWorkerDomain,
|
|
99
|
+
environment: this.props.siteWorkerDomain.environment ?? 'production',
|
|
99
100
|
hostname: `${this.props.siteSubDomain}.${this.props.domainName}`,
|
|
100
101
|
service: this.siteWorkerScript.scriptName,
|
|
101
102
|
})
|
|
@@ -107,15 +108,21 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
|
|
|
107
108
|
* @param secretKey the secret key
|
|
108
109
|
* @returns the secret value
|
|
109
110
|
*/
|
|
110
|
-
protected resolveSecretFromAWS(secretName: string, secretKey: string) {
|
|
111
|
+
protected resolveSecretFromAWS(secretName: string, secretKey: string, id?: string) {
|
|
111
112
|
if (!this.awsProvider) {
|
|
112
113
|
throw new Error(`Unable to resolve secret:${secretKey}. AWS provider not found`)
|
|
113
114
|
}
|
|
114
|
-
const secret = new DataAwsSecretsmanagerSecret(this, `${this.id}-${secretName}-${secretKey}`, {
|
|
115
|
-
|
|
116
|
-
provider: this.awsProvider,
|
|
117
|
-
secretId: secret.id,
|
|
115
|
+
const secret = new DataAwsSecretsmanagerSecret(this, id ?? `${this.id}-${secretName}-${secretKey}`, {
|
|
116
|
+
name: secretName,
|
|
118
117
|
})
|
|
118
|
+
const secretVersion = new DataAwsSecretsmanagerSecretVersion(
|
|
119
|
+
this,
|
|
120
|
+
id ? `${id}-ver` : `${this.id}-${secretName}-${secretKey}-ver`,
|
|
121
|
+
{
|
|
122
|
+
provider: this.awsProvider,
|
|
123
|
+
secretId: secret.id,
|
|
124
|
+
}
|
|
125
|
+
)
|
|
119
126
|
if (!secretVersion) throw new Error(`Unable to resolve secret:${secretName}`)
|
|
120
127
|
return Fn.lookup(Fn.jsondecode(secretVersion.secretString), secretKey)
|
|
121
128
|
}
|
|
@@ -128,13 +135,13 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
|
|
|
128
135
|
* @param secretKey the secret key
|
|
129
136
|
* @returns the secret value
|
|
130
137
|
*/
|
|
131
|
-
protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string) {
|
|
138
|
+
protected resolveSecretFromAzure(resourceGroupName: string, keyVaultName: string, secretKey: string, id?: string) {
|
|
132
139
|
if (!this.azurermProvider) {
|
|
133
140
|
throw new Error(`Unable to resolve secret:${secretKey}. Azurerm provider not found`)
|
|
134
141
|
}
|
|
135
142
|
const keyVaultData = new DataAzurermKeyVault(
|
|
136
143
|
this,
|
|
137
|
-
`${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-vault`,
|
|
144
|
+
id ? `${id}-vault` : `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-vault`,
|
|
138
145
|
{
|
|
139
146
|
resourceGroupName: resourceGroupName,
|
|
140
147
|
name: keyVaultName,
|
|
@@ -143,7 +150,7 @@ export class CloudflareWorkerSite extends CommonCloudflareConstruct {
|
|
|
143
150
|
)
|
|
144
151
|
const secretValueData = new DataAzurermKeyVaultSecret(
|
|
145
152
|
this,
|
|
146
|
-
`${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-secret`,
|
|
153
|
+
id ? `${id}-secret` : `${this.id}-${resourceGroupName}-${keyVaultName}-${secretKey}-secret`,
|
|
147
154
|
{
|
|
148
155
|
name: secretKey,
|
|
149
156
|
keyVaultId: keyVaultData.id,
|