Skip to content

Commit

Permalink
Merge branch 'main' into 28667
Browse files Browse the repository at this point in the history
  • Loading branch information
GavinZZ authored Jan 29, 2024
2 parents bd99b03 + 6a7a24a commit 85c3ed2
Show file tree
Hide file tree
Showing 18 changed files with 47 additions and 107 deletions.
4 changes: 2 additions & 2 deletions packages/@aws-cdk/cloudformation-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.0.43",
"@aws-cdk/service-spec-types": "^0.0.43",
"@aws-cdk/aws-service-spec": "^0.0.45",
"@aws-cdk/service-spec-types": "^0.0.45",
"chalk": "^4",
"diff": "^5.1.0",
"fast-deep-equal": "^3.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/integ-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@aws-cdk/cloud-assembly-schema": "0.0.0",
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/aws-service-spec": "^0.0.43",
"@aws-cdk/aws-service-spec": "^0.0.45",
"cdk-assets": "0.0.0",
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
"aws-cdk": "0.0.0",
Expand Down
13 changes: 0 additions & 13 deletions packages/aws-cdk-lib/amzn-sdc/.jsiirc.json

This file was deleted.

39 changes: 0 additions & 39 deletions packages/aws-cdk-lib/amzn-sdc/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions packages/aws-cdk-lib/amzn-sdc/lib/index.ts

This file was deleted.

13 changes: 0 additions & 13 deletions packages/aws-cdk-lib/aws-codetest/.jsiirc.json

This file was deleted.

1 change: 0 additions & 1 deletion packages/aws-cdk-lib/aws-codetest/index.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/aws-cdk-lib/aws-codetest/lib/index.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-lambda/lib/function.ts
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ export interface FunctionOptions extends EventInvokeConfigOptions {
/**
* The log group the function sends logs to.
*
* By default, Lambda functions send logs to an automatically created default log group named /aws/lambda/<function name>.
* By default, Lambda functions send logs to an automatically created default log group named /aws/lambda/\<function name\>.
* However you cannot change the properties of this auto-created log group using the AWS CDK, e.g. you cannot set a different log retention.
*
* Use the `logGroup` property to create a fully customizable LogGroup ahead of time, and instruct the Lambda function to send logs to it.
Expand Down
13 changes: 13 additions & 0 deletions packages/aws-cdk-lib/aws-ssmguiconnect/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"targets": {
"java": {
"package": "software.amazon.awscdk.services.ssmguiconnect"
},
"dotnet": {
"package": "Amazon.CDK.AWS.SSMGuiConnect"
},
"python": {
"module": "aws_cdk.aws_ssmguiconnect"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# AWS::CodeTest Construct Library
# AWS::SSMGuiConnect Construct Library
<!--BEGIN STABILITY BANNER-->

---
Expand All @@ -16,23 +16,23 @@
This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project.

```ts nofixture
import * as codetest from 'aws-cdk-lib/aws-codetest';
import * as ssmguiconnect from 'aws-cdk-lib/aws-ssmguiconnect';
```

<!--BEGIN CFNONLY DISCLAIMER-->

There are no official hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. Here are some suggestions on how to proceed:

- Search [Construct Hub for CodeTest construct libraries](https://constructs.dev/search?q=codetest)
- Use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, in the same way you would use [the CloudFormation AWS::CodeTest resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_CodeTest.html) directly.
- Search [Construct Hub for SSMGuiConnect construct libraries](https://constructs.dev/search?q=ssmguiconnect)
- Use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, in the same way you would use [the CloudFormation AWS::SSMGuiConnect resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_SSMGuiConnect.html) directly.


<!--BEGIN CFNONLY DISCLAIMER-->

There are no hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet.
However, you can still use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, and use this service exactly as you would using CloudFormation directly.

For more information on the resources and properties available for this service, see the [CloudFormation documentation for AWS::CodeTest](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_CodeTest.html).
For more information on the resources and properties available for this service, see the [CloudFormation documentation for AWS::SSMGuiConnect](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_SSMGuiConnect.html).

(Read the [CDK Contributing Guide](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and submit an RFC if you are interested in contributing to this construct library.)

Expand Down
File renamed without changes.
2 changes: 2 additions & 0 deletions packages/aws-cdk-lib/aws-ssmguiconnect/lib/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// AWS::SSMGuiConnect Cloudformation Resources
export * from './ssmguiconnect.generated';
3 changes: 1 addition & 2 deletions packages/aws-cdk-lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export * as alexa_ask from './alexa-ask';
export * as amzn_sdc from './amzn-sdc';
export * as assertions from './assertions';
export * as assets from './assets';
export * as aws_accessanalyzer from './aws-accessanalyzer';
Expand Down Expand Up @@ -58,7 +57,6 @@ export * as aws_codepipeline_actions from './aws-codepipeline-actions';
export * as aws_codestar from './aws-codestar';
export * as aws_codestarconnections from './aws-codestarconnections';
export * as aws_codestarnotifications from './aws-codestarnotifications';
export * as aws_codetest from './aws-codetest';
export * as aws_cognito from './aws-cognito';
export * as aws_comprehend from './aws-comprehend';
export * as aws_config from './aws-config';
Expand Down Expand Up @@ -241,6 +239,7 @@ export * as aws_sns_subscriptions from './aws-sns-subscriptions';
export * as aws_sqs from './aws-sqs';
export * as aws_ssm from './aws-ssm';
export * as aws_ssmcontacts from './aws-ssmcontacts';
export * as aws_ssmguiconnect from './aws-ssmguiconnect';
export * as aws_ssmincidents from './aws-ssmincidents';
export * as aws_sso from './aws-sso';
export * as aws_stepfunctions from './aws-stepfunctions';
Expand Down
5 changes: 2 additions & 3 deletions packages/aws-cdk-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"yaml": "1.10.2"
},
"devDependencies": {
"@aws-cdk/aws-service-spec": "^0.0.43",
"@aws-cdk/aws-service-spec": "^0.0.45",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/custom-resource-handlers": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
Expand Down Expand Up @@ -209,7 +209,6 @@
"./.jsii": "./.jsii",
"./.warnings.jsii.js": "./.warnings.jsii.js",
"./alexa-ask": "./alexa-ask/index.js",
"./amzn-sdc": "./amzn-sdc/index.js",
"./assertions": "./assertions/index.js",
"./assertions/lib/helpers-internal": "./assertions/lib/helpers-internal/index.js",
"./assets": "./assets/index.js",
Expand Down Expand Up @@ -269,7 +268,6 @@
"./aws-codestar": "./aws-codestar/index.js",
"./aws-codestarconnections": "./aws-codestarconnections/index.js",
"./aws-codestarnotifications": "./aws-codestarnotifications/index.js",
"./aws-codetest": "./aws-codetest/index.js",
"./aws-cognito": "./aws-cognito/index.js",
"./aws-comprehend": "./aws-comprehend/index.js",
"./aws-config": "./aws-config/index.js",
Expand Down Expand Up @@ -454,6 +452,7 @@
"./aws-sqs": "./aws-sqs/index.js",
"./aws-ssm": "./aws-ssm/index.js",
"./aws-ssmcontacts": "./aws-ssmcontacts/index.js",
"./aws-ssmguiconnect": "./aws-ssmguiconnect/index.js",
"./aws-ssmincidents": "./aws-ssmincidents/index.js",
"./aws-sso": "./aws-sso/index.js",
"./aws-stepfunctions": "./aws-stepfunctions/index.js",
Expand Down
9 changes: 3 additions & 6 deletions packages/aws-cdk-lib/scripts/scope-map.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
"alexa-ask": [
"Alexa::ASK"
],
"amzn-sdc": [
"AMZN::SDC"
],
"aws-accessanalyzer": [
"AWS::AccessAnalyzer"
],
Expand Down Expand Up @@ -149,9 +146,6 @@
"aws-codestarnotifications": [
"AWS::CodeStarNotifications"
],
"aws-codetest": [
"AWS::CodeTest"
],
"aws-cognito": [
"AWS::Cognito"
],
Expand Down Expand Up @@ -648,6 +642,9 @@
"aws-ssmcontacts": [
"AWS::SSMContacts"
],
"aws-ssmguiconnect": [
"AWS::SSMGuiConnect"
],
"aws-ssmincidents": [
"AWS::SSMIncidents"
],
Expand Down
6 changes: 3 additions & 3 deletions tools/@aws-cdk/spec2cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.0.43",
"@aws-cdk/service-spec-importers": "^0.0.16",
"@aws-cdk/service-spec-types": "^0.0.43",
"@aws-cdk/aws-service-spec": "^0.0.45",
"@aws-cdk/service-spec-importers": "^0.0.18",
"@aws-cdk/service-spec-types": "^0.0.45",
"@cdklabs/tskb": "^0.0.3",
"@cdklabs/typewriter": "^0.0.3",
"camelcase": "^6",
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,25 @@
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.43":
version "0.0.43"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.43.tgz#7d0e0c3a2259426628dd552a7450299782513733"
integrity sha512-sir1+8H/xY85BJlVUgwUcRfV8mjnerEq24rcQ8vE5W7ae2BQCbWXQjUfhNMr5cyiMA4XKw59dBN3g4JHv1Gp0w==
"@aws-cdk/aws-service-spec@^0.0.45":
version "0.0.45"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.45.tgz#ffe1eece531ee8ea091b1f77acd4571b727edaf3"
integrity sha512-0n3ZeMj1YTUVK/PqR4NoW94xn8nRiyMeMxfSD/nCgun6IwKqXHY4Us3rF3aqfHq0Dv8YBf2ZnWRidCP6tjL95g==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.43"
"@aws-cdk/service-spec-types" "^0.0.45"
"@cdklabs/tskb" "^0.0.3"

"@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-importers@^0.0.16":
version "0.0.16"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.16.tgz#897a7e2aa8ed08e3a12331e0f87484537f128405"
integrity sha512-YkJlFCNTF4sLJc2I7ePD9mDzy3R8p6xoypiPaQ7HgRIpVc0LbX/LCqBU0ml1pM9Qiy0gq1uOHjHxFNF4kYq9kQ==
"@aws-cdk/service-spec-importers@^0.0.18":
version "0.0.18"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.18.tgz#66023f00b95dc7017360a68451f501e53f9f6927"
integrity sha512-BZJhSG5M/M1cLZNHUy3/h2nEWE5AAC6Oz2xTNQGwpxluxf+l6Hw2yye+lwFLZhImv351dKRAKHnRFkcnHq7nPA==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.43"
"@aws-cdk/service-spec-types" "^0.0.45"
"@cdklabs/tskb" "^0.0.3"
ajv "^6"
canonicalize "^2.0.0"
Expand All @@ -85,10 +85,10 @@
glob "^8"
sort-json "^2.0.1"

"@aws-cdk/service-spec-types@^0.0.43":
version "0.0.43"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.43.tgz#71a7555bd989650b711ec3ade943f239305ddf6f"
integrity sha512-jFPbTNsEKMVtnh87iUM6wnvbus2dxcPDZPCCmmmauln95O0iRd+cNoygsEzAzPFl9/Dk7Vg8PwHj+2nVN95bwg==
"@aws-cdk/service-spec-types@^0.0.45":
version "0.0.45"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.45.tgz#e66517a3fb1692694afaa517dbf62663b45ac641"
integrity sha512-srCb7Wwr2ZYi4AZIJ+rufIxqDEt9+APQprzXxcEy2uz7Vf9ACMmt18J8glR647BpZJHf95kyhn+57kOaMYaCiw==
dependencies:
"@cdklabs/tskb" "^0.0.3"

Expand Down

0 comments on commit 85c3ed2

Please sign in to comment.