Skip to content

Commit 166466d

Browse files
authored
chore(iot1click): remove the shut down service aws-iot1click (#32844)
Removing the aws-iot1click package for the shut down service https://docs.aws.amazon.com/iot/latest/developerguide/iot-legacy-services.html This PR is required to fix the Spec update PR cdklabs/awscdk-service-spec#1559 I updated the Spec2Cdk tool to accept extra parameter to maintain the list of services we want to skip generating them. ### Checklist - [X] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 49eb9d3 commit 166466d

File tree

15 files changed

+10
-59
lines changed

15 files changed

+10
-59
lines changed

.github/workflows/issue-label-assign.yml

-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ env:
173173
{"area":"@aws-cdk/aws-inspector","keywords":["aws-inspector","inspector"],"labels":["@aws-cdk/aws-inspector"]},
174174
{"area":"@aws-cdk/aws-iot","keywords":["internet-of-things","aws-iot","iot"],"labels":["@aws-cdk/aws-iot"],"affixes":{"suffixes":["-alpha"]}},
175175
{"area":"@aws-cdk/aws-iot-actions","keywords":["aws-iot-actions","iot-actions"],"labels":["@aws-cdk/aws-iot-actions"],"affixes":{"suffixes":["-alpha"]}},
176-
{"area":"@aws-cdk/aws-iot1click","keywords":["aws-iot1click","iot1click"],"labels":["@aws-cdk/aws-iot1click"]},
177176
{"area":"@aws-cdk/aws-iotanalytics","keywords":["aws-iotanalytics","iotanalytics"],"labels":["@aws-cdk/aws-iotanalytics"]},
178177
{"area":"@aws-cdk/aws-iotevents","keywords":["aws-iotevents","iotevents"],"labels":["@aws-cdk/aws-iotevents"],"affixes":{"suffixes":["-alpha"]}},
179178
{"area":"@aws-cdk/aws-iotevents-actions","keywords":["aws-iotevents","iotevents-actions"],"labels":["@aws-cdk/aws-iotevents-actions"],"affixes":{"suffixes":["-alpha"]}},

deprecated_apis.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1098,3 +1098,4 @@ aws-cdk-lib.pipelines.UpdatePipelineActionProps#pipelineStackHierarchicalId
10981098
aws-cdk-lib.pipelines.UpdatePipelineActionProps#pipelineStackName
10991099
aws-cdk-lib.pipelines.UpdatePipelineActionProps#privileged
11001100
aws-cdk-lib.pipelines.UpdatePipelineActionProps#projectName
1101+
aws-cdk-lib.iot1click

packages/aws-cdk-lib/aws-iot1click/.jsiirc.json

-13
This file was deleted.

packages/aws-cdk-lib/aws-iot1click/README.md

-27
This file was deleted.

packages/aws-cdk-lib/aws-iot1click/index.ts

-1
This file was deleted.

packages/aws-cdk-lib/aws-iot1click/lib/index.ts

-1
This file was deleted.

packages/aws-cdk-lib/custom-resources/lib/helpers-internal/sdk-v2-to-v3.json

-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@
5757
"forecastqueryservice": "forecastquery",
5858
"forecastservice": "forecast",
5959
"globalaccelerator": "global-accelerator",
60-
"iot1clickdevicesservice": "iot-1click-devices-service",
61-
"iot1clickprojects": "iot-1click-projects",
6260
"iotevents": "iot-events",
6361
"ioteventsdata": "iot-events-data",
6462
"iotjobsdataplane": "iot-jobs-data-plane",

packages/aws-cdk-lib/custom-resources/lib/helpers-internal/sdk-v3-metadata.json

-6
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,6 @@
492492
"internetmonitor": {
493493
"iamPrefix": "internetmonitor"
494494
},
495-
"iot-1click-devices-service": {
496-
"iamPrefix": "iot1click"
497-
},
498-
"iot-1click-projects": {
499-
"iamPrefix": "iot1click"
500-
},
501495
"iot-data-plane": {
502496
"iamPrefix": "iotdata"
503497
},

packages/aws-cdk-lib/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ export * as aws_inspectorv2 from './aws-inspectorv2';
133133
export * as aws_internetmonitor from './aws-internetmonitor';
134134
export * as aws_invoicing from './aws-invoicing';
135135
export * as aws_iot from './aws-iot';
136-
export * as aws_iot1click from './aws-iot1click';
137136
export * as aws_iotanalytics from './aws-iotanalytics';
138137
export * as aws_iotcoredeviceadvisor from './aws-iotcoredeviceadvisor';
139138
export * as aws_iotevents from './aws-iotevents';

packages/aws-cdk-lib/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,6 @@
347347
"./aws-internetmonitor": "./aws-internetmonitor/index.js",
348348
"./aws-invoicing": "./aws-invoicing/index.js",
349349
"./aws-iot": "./aws-iot/index.js",
350-
"./aws-iot1click": "./aws-iot1click/index.js",
351350
"./aws-iotanalytics": "./aws-iotanalytics/index.js",
352351
"./aws-iotcoredeviceadvisor": "./aws-iotcoredeviceadvisor/index.js",
353352
"./aws-iotevents": "./aws-iotevents/index.js",

packages/aws-cdk-lib/scripts/gen.ts

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ async function main() {
2020
const generated = (await generateAll(awsCdkLibDir, {
2121
coreImport: '../../core',
2222
cloudwatchImport: '../../aws-cloudwatch',
23+
skippedServices: ['AWS::IoT1Click'],
2324
scopeMapPath,
2425
}));
2526

packages/aws-cdk-lib/scripts/scope-map.json

-3
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,6 @@
359359
"aws-iot": [
360360
"AWS::IoT"
361361
],
362-
"aws-iot1click": [
363-
"AWS::IoT1Click"
364-
],
365362
"aws-iotanalytics": [
366363
"AWS::IoTAnalytics"
367364
],

tools/@aws-cdk/pkglint/lib/aws-service-official-names.json

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"AWS::GuardDuty": "Amazon GuardDuty",
5151
"AWS::IAM": "AWS Identity and Access Management",
5252
"AWS::Inspector": "Amazon Inspector",
53-
"AWS::IoT1Click": "AWS IoT 1-Click",
5453
"AWS::IoT": "AWS IoT",
5554
"AWS::IoTAnalytics": "AWS IoT Analytics",
5655
"AWS::IoTThingsGraph": "AWS IoT Things Graph",

tools/@aws-cdk/spec2cdk/lib/cfn2ts/index.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,10 @@ function computeSuffix(scope: string, allScopes: string[]): string | undefined {
107107
*/
108108
export async function generateAll(
109109
outPath: string,
110-
{ scopeMapPath, ...options }: GenerateAllOptions,
110+
{ scopeMapPath, skippedServices, ...options }: GenerateAllOptions,
111111
): Promise<ModuleMap> {
112-
const scopes = await getAllScopes('cloudFormationNamespace');
112+
const allScopes = await getAllScopes('cloudFormationNamespace');
113+
const scopes = skippedServices? allScopes.filter((scope) => !skippedServices.includes(scope)) : allScopes;
113114
const moduleMap = await readScopeMap(scopeMapPath);
114115

115116
// Make sure all scopes have their own dedicated package/namespace.

tools/@aws-cdk/spec2cdk/lib/cfn2ts/types.ts

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ export interface GenerateAllOptions extends CodeGeneratorOptions, AugmentationsG
2828
* Path of the file containing the map of module names to their CFN Scopes
2929
*/
3030
scopeMapPath: string;
31+
32+
/**
33+
* List of service names to be skipped it will be in format AWS::Service like AWS::S3
34+
*/
35+
skippedServices?: string[];
3136
}
3237

3338
/**

0 commit comments

Comments
 (0)