Skip to content

Commit

Permalink
Merge branch 'main' into kinesisfirehose-extra-role
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Sep 5, 2023
2 parents 71f5dfc + e628e6e commit 69c366d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions packages/aws-cdk-lib/aws-ssm/lib/parameter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ export interface ParameterOptions {
readonly parameterName?: string;

/**
* Indicates of the parameter name is a simple name (i.e. does not include "/"
* Indicates if the parameter name is a simple name (i.e. does not include "/"
* separators).
*
* This is only required only if `parameterName` is a token, which means we
* This is required only if `parameterName` is a token, which means we
* are unable to detect if the name is simple or "path-like" for the purpose
* of rendering SSM parameter ARNs.
*
Expand Down Expand Up @@ -168,7 +168,7 @@ abstract class ParameterBase extends Resource implements IParameter {
/**
* The encryption key that is used to encrypt this parameter.
*
* * @default - default master key
* @default - default master key
*/
public readonly encryptionKey?: kms.IKey;

Expand Down Expand Up @@ -337,10 +337,10 @@ export interface CommonStringParameterAttributes {
readonly parameterName: string;

/**
* Indicates of the parameter name is a simple name (i.e. does not include "/"
* Indicates if the parameter name is a simple name (i.e. does not include "/"
* separators).
*
* This is only required only if `parameterName` is a token, which means we
* This is required only if `parameterName` is a token, which means we
* are unable to detect if the name is simple or "path-like" for the purpose
* of rendering SSM parameter ARNs.
*
Expand Down
4 changes: 2 additions & 2 deletions tools/@aws-cdk/spec2cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.0.10",
"@aws-cdk/service-spec-types": "^0.0.10",
"@aws-cdk/aws-service-spec": "^0.0.11",
"@aws-cdk/service-spec-types": "^0.0.11",
"@cdklabs/tskb": "^0.0.1",
"@cdklabs/typewriter": "^0.0.1",
"camelcase": "^6",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -55,23 +55,23 @@
resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.1.tgz#6dc9b7cdb22ff622a7176141197962360c33e9ac"
integrity sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg==

"@aws-cdk/aws-service-spec@^0.0.10":
version "0.0.10"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.10.tgz#0d78a804ce4900d10265e28887ccddba73561ccb"
integrity sha512-U6oUMAqj//Css0QpU5yJPOQi1ZPhnY/E5RL4WGJqytmwVnhKERoYWEbyaMs4X8P4N0Hqd/+GvpcJeHGAgf/GkQ==
"@aws-cdk/aws-service-spec@^0.0.11":
version "0.0.11"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.11.tgz#5c7a204686c769c76859e23f587d977542054c5d"
integrity sha512-yPXFV0qVsK7lDstjrdSa1z0MDLRxh8MrX1JdnI9IiY8gWrJ9l1lC3RDYm45IQhfT6752wpIaDGi45kT3WnmM1w==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.10"
"@aws-cdk/service-spec-types" "^0.0.11"
"@cdklabs/tskb" "^0.0.1"

"@aws-cdk/lambda-layer-kubectl-v24@^2.0.242":
version "2.0.242"
resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v24/-/lambda-layer-kubectl-v24-2.0.242.tgz#4273a5ad7714f933a7eba155eb9280823086db71"
integrity sha512-7/wIOo685tmrEe4hh6zqDELhBZh5OQGf3Hd2FU2Vnwy2ZubW8qTmEw5gqJCsCrGKeYDoa1BcVhDRZ/nzjkaqyA==

"@aws-cdk/service-spec-types@^0.0.10":
version "0.0.10"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.10.tgz#63f5107202113a6f3a420a565b7b83ffc33f40f1"
integrity sha512-W5+Ko7oE/lUE3+CZL7bVgLLOOVVwiB1TptupoTP4pmMENr81SQ1TMtN1t6z7IF9kEQWfh0JukXc6ocVvSQToJg==
"@aws-cdk/service-spec-types@^0.0.11":
version "0.0.11"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.11.tgz#d2745eb607c4d95ea5219fd5e9531d60c87a15db"
integrity sha512-sCFMj+Pvmw1Q04dFxs/Khts0rZP5fu2rMZE+ayT+1wLHTzdLXbRhBR0LDsGKG2QHRzNqTDVToMJSJJE5sBP1Sw==
dependencies:
"@cdklabs/tskb" "^0.0.1"

Expand Down

0 comments on commit 69c366d

Please sign in to comment.