diff --git a/.github/workflows/issue-label-assign.yml b/.github/workflows/issue-label-assign.yml index 15a4b5688d43b..95e422e53d221 100644 --- a/.github/workflows/issue-label-assign.yml +++ b/.github/workflows/issue-label-assign.yml @@ -173,7 +173,6 @@ env: {"area":"@aws-cdk/aws-inspector","keywords":["aws-inspector","inspector"],"labels":["@aws-cdk/aws-inspector"]}, {"area":"@aws-cdk/aws-iot","keywords":["internet-of-things","aws-iot","iot"],"labels":["@aws-cdk/aws-iot"],"affixes":{"suffixes":["-alpha"]}}, {"area":"@aws-cdk/aws-iot-actions","keywords":["aws-iot-actions","iot-actions"],"labels":["@aws-cdk/aws-iot-actions"],"affixes":{"suffixes":["-alpha"]}}, - {"area":"@aws-cdk/aws-iot1click","keywords":["aws-iot1click","iot1click"],"labels":["@aws-cdk/aws-iot1click"]}, {"area":"@aws-cdk/aws-iotanalytics","keywords":["aws-iotanalytics","iotanalytics"],"labels":["@aws-cdk/aws-iotanalytics"]}, {"area":"@aws-cdk/aws-iotevents","keywords":["aws-iotevents","iotevents"],"labels":["@aws-cdk/aws-iotevents"],"affixes":{"suffixes":["-alpha"]}}, {"area":"@aws-cdk/aws-iotevents-actions","keywords":["aws-iotevents","iotevents-actions"],"labels":["@aws-cdk/aws-iotevents-actions"],"affixes":{"suffixes":["-alpha"]}}, diff --git a/deprecated_apis.txt b/deprecated_apis.txt index 81f8cec199a6f..8cdf9adcd1b92 100644 --- a/deprecated_apis.txt +++ b/deprecated_apis.txt @@ -1098,3 +1098,4 @@ aws-cdk-lib.pipelines.UpdatePipelineActionProps#pipelineStackHierarchicalId aws-cdk-lib.pipelines.UpdatePipelineActionProps#pipelineStackName aws-cdk-lib.pipelines.UpdatePipelineActionProps#privileged aws-cdk-lib.pipelines.UpdatePipelineActionProps#projectName +aws-cdk-lib.iot1click diff --git a/packages/aws-cdk-lib/aws-iot1click/.jsiirc.json b/packages/aws-cdk-lib/aws-iot1click/.jsiirc.json deleted file mode 100644 index 7132206a4af7f..0000000000000 --- a/packages/aws-cdk-lib/aws-iot1click/.jsiirc.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "targets": { - "dotnet": { - "namespace": "Amazon.CDK.AWS.IoT1Click" - }, - "java": { - "package": "software.amazon.awscdk.services.iot1click" - }, - "python": { - "module": "aws_cdk.aws_iot1click" - } - } -} diff --git a/packages/aws-cdk-lib/aws-iot1click/README.md b/packages/aws-cdk-lib/aws-iot1click/README.md deleted file mode 100644 index d67033f75c55e..0000000000000 --- a/packages/aws-cdk-lib/aws-iot1click/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# AWS IoT 1-Click Construct Library - - -This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project. - -```ts nofixture -import * as iot1click from 'aws-cdk-lib/aws-iot1click'; -``` - - - -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 IoT1Click construct libraries](https://constructs.dev/search?q=iot1click) -- 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::IoT1Click resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_IoT1Click.html) directly. - - - - -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::IoT1Click](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_IoT1Click.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.) - - diff --git a/packages/aws-cdk-lib/aws-iot1click/index.ts b/packages/aws-cdk-lib/aws-iot1click/index.ts deleted file mode 100644 index f41a696fd204d..0000000000000 --- a/packages/aws-cdk-lib/aws-iot1click/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './lib'; diff --git a/packages/aws-cdk-lib/aws-iot1click/lib/index.ts b/packages/aws-cdk-lib/aws-iot1click/lib/index.ts deleted file mode 100644 index 9adc206ef8dbd..0000000000000 --- a/packages/aws-cdk-lib/aws-iot1click/lib/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './iot1click.generated'; diff --git a/packages/aws-cdk-lib/custom-resources/lib/helpers-internal/sdk-v2-to-v3.json b/packages/aws-cdk-lib/custom-resources/lib/helpers-internal/sdk-v2-to-v3.json index 87d3ee81f1e72..bf8d179c6e16b 100644 --- a/packages/aws-cdk-lib/custom-resources/lib/helpers-internal/sdk-v2-to-v3.json +++ b/packages/aws-cdk-lib/custom-resources/lib/helpers-internal/sdk-v2-to-v3.json @@ -57,8 +57,6 @@ "forecastqueryservice": "forecastquery", "forecastservice": "forecast", "globalaccelerator": "global-accelerator", - "iot1clickdevicesservice": "iot-1click-devices-service", - "iot1clickprojects": "iot-1click-projects", "iotevents": "iot-events", "ioteventsdata": "iot-events-data", "iotjobsdataplane": "iot-jobs-data-plane", diff --git a/packages/aws-cdk-lib/custom-resources/lib/helpers-internal/sdk-v3-metadata.json b/packages/aws-cdk-lib/custom-resources/lib/helpers-internal/sdk-v3-metadata.json index 851878844e36c..399f94a66c5f6 100644 --- a/packages/aws-cdk-lib/custom-resources/lib/helpers-internal/sdk-v3-metadata.json +++ b/packages/aws-cdk-lib/custom-resources/lib/helpers-internal/sdk-v3-metadata.json @@ -492,12 +492,6 @@ "internetmonitor": { "iamPrefix": "internetmonitor" }, - "iot-1click-devices-service": { - "iamPrefix": "iot1click" - }, - "iot-1click-projects": { - "iamPrefix": "iot1click" - }, "iot-data-plane": { "iamPrefix": "iotdata" }, diff --git a/packages/aws-cdk-lib/index.ts b/packages/aws-cdk-lib/index.ts index 9eee38240790a..03f9fb48fbebf 100644 --- a/packages/aws-cdk-lib/index.ts +++ b/packages/aws-cdk-lib/index.ts @@ -133,7 +133,6 @@ export * as aws_inspectorv2 from './aws-inspectorv2'; export * as aws_internetmonitor from './aws-internetmonitor'; export * as aws_invoicing from './aws-invoicing'; export * as aws_iot from './aws-iot'; -export * as aws_iot1click from './aws-iot1click'; export * as aws_iotanalytics from './aws-iotanalytics'; export * as aws_iotcoredeviceadvisor from './aws-iotcoredeviceadvisor'; export * as aws_iotevents from './aws-iotevents'; diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json index 724c217e5f760..2e15d6ce6a46a 100644 --- a/packages/aws-cdk-lib/package.json +++ b/packages/aws-cdk-lib/package.json @@ -347,7 +347,6 @@ "./aws-internetmonitor": "./aws-internetmonitor/index.js", "./aws-invoicing": "./aws-invoicing/index.js", "./aws-iot": "./aws-iot/index.js", - "./aws-iot1click": "./aws-iot1click/index.js", "./aws-iotanalytics": "./aws-iotanalytics/index.js", "./aws-iotcoredeviceadvisor": "./aws-iotcoredeviceadvisor/index.js", "./aws-iotevents": "./aws-iotevents/index.js", diff --git a/packages/aws-cdk-lib/scripts/gen.ts b/packages/aws-cdk-lib/scripts/gen.ts index 2bb7a78e0988b..1ef52be8044ba 100644 --- a/packages/aws-cdk-lib/scripts/gen.ts +++ b/packages/aws-cdk-lib/scripts/gen.ts @@ -20,6 +20,7 @@ async function main() { const generated = (await generateAll(awsCdkLibDir, { coreImport: '../../core', cloudwatchImport: '../../aws-cloudwatch', + skippedServices: ['AWS::IoT1Click'], scopeMapPath, })); diff --git a/packages/aws-cdk-lib/scripts/scope-map.json b/packages/aws-cdk-lib/scripts/scope-map.json index 95afe66aedfc3..a25f26649a690 100644 --- a/packages/aws-cdk-lib/scripts/scope-map.json +++ b/packages/aws-cdk-lib/scripts/scope-map.json @@ -359,9 +359,6 @@ "aws-iot": [ "AWS::IoT" ], - "aws-iot1click": [ - "AWS::IoT1Click" - ], "aws-iotanalytics": [ "AWS::IoTAnalytics" ], diff --git a/tools/@aws-cdk/pkglint/lib/aws-service-official-names.json b/tools/@aws-cdk/pkglint/lib/aws-service-official-names.json index 61ac88c6f3e6c..ea13476e369ea 100644 --- a/tools/@aws-cdk/pkglint/lib/aws-service-official-names.json +++ b/tools/@aws-cdk/pkglint/lib/aws-service-official-names.json @@ -50,7 +50,6 @@ "AWS::GuardDuty": "Amazon GuardDuty", "AWS::IAM": "AWS Identity and Access Management", "AWS::Inspector": "Amazon Inspector", - "AWS::IoT1Click": "AWS IoT 1-Click", "AWS::IoT": "AWS IoT", "AWS::IoTAnalytics": "AWS IoT Analytics", "AWS::IoTThingsGraph": "AWS IoT Things Graph", diff --git a/tools/@aws-cdk/spec2cdk/lib/cfn2ts/index.ts b/tools/@aws-cdk/spec2cdk/lib/cfn2ts/index.ts index a874956e1abca..4d2e5605b05fc 100644 --- a/tools/@aws-cdk/spec2cdk/lib/cfn2ts/index.ts +++ b/tools/@aws-cdk/spec2cdk/lib/cfn2ts/index.ts @@ -107,9 +107,10 @@ function computeSuffix(scope: string, allScopes: string[]): string | undefined { */ export async function generateAll( outPath: string, - { scopeMapPath, ...options }: GenerateAllOptions, + { scopeMapPath, skippedServices, ...options }: GenerateAllOptions, ): Promise { - const scopes = await getAllScopes('cloudFormationNamespace'); + const allScopes = await getAllScopes('cloudFormationNamespace'); + const scopes = skippedServices? allScopes.filter((scope) => !skippedServices.includes(scope)) : allScopes; const moduleMap = await readScopeMap(scopeMapPath); // Make sure all scopes have their own dedicated package/namespace. diff --git a/tools/@aws-cdk/spec2cdk/lib/cfn2ts/types.ts b/tools/@aws-cdk/spec2cdk/lib/cfn2ts/types.ts index a2a09e5aa02a9..04c2e9643658c 100644 --- a/tools/@aws-cdk/spec2cdk/lib/cfn2ts/types.ts +++ b/tools/@aws-cdk/spec2cdk/lib/cfn2ts/types.ts @@ -28,6 +28,11 @@ export interface GenerateAllOptions extends CodeGeneratorOptions, AugmentationsG * Path of the file containing the map of module names to their CFN Scopes */ scopeMapPath: string; + + /** + * List of service names to be skipped it will be in format AWS::Service like AWS::S3 + */ + skippedServices?: string[]; } /**