Skip to content

Commit 81b4174

Browse files
author
Elad Ben-Israel
authoredJan 8, 2019
feat: stop generating legacy cloudformation resources (#1493)
BREAKING CHANGE: the deprecated `cloudformation.XxxResource` classes have been removed. Use the `CfnXxx` classes instead.
1 parent 4d6d5ca commit 81b4174

File tree

4 files changed

+2
-50
lines changed

4 files changed

+2
-50
lines changed
 

‎packages/@aws-cdk/aws-codepipeline/lib/custom-action-registration.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import cpapi = require('@aws-cdk/aws-codepipeline-api');
22
import cdk = require('@aws-cdk/cdk');
3-
import { cloudformation } from './codepipeline.generated';
3+
import { CfnCustomActionType } from './codepipeline.generated';
44

55
/**
66
* The creation attributes used for defining a configuration property
@@ -119,7 +119,7 @@ export class CustomActionRegistration extends cdk.Construct {
119119
constructor(parent: cdk.Construct, id: string, props: CustomActionRegistrationProps) {
120120
super(parent, id);
121121

122-
new cloudformation.CustomActionTypeResource(this, 'Resource', {
122+
new CfnCustomActionType(this, 'Resource', {
123123
category: props.category,
124124
inputArtifactDetails: {
125125
minimumCount: props.artifactBounds.minInputs,

‎packages/@aws-cdk/aws-iam/test/test.legacy-resources.ts

-24
This file was deleted.

‎tools/cfn2ts/lib/codegen.ts

-9
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,10 @@ export default class CodeGenerator {
7171

7272
const cfnName = SpecName.parse(name);
7373
const resourceName = genspec.CodeName.forCfnResource(cfnName);
74-
const legacyResourceName = genspec.CodeName.forLegacyResource(cfnName);
7574
this.code.line();
7675

7776
this.emitResourceType(resourceName, resourceType);
7877
this.emitPropertyTypes(name, resourceName);
79-
80-
// emit the "cloudformation.XxxResource" classes for backwards compatibility
81-
// those will also include a deprecation warning.
82-
this.code.line('// legacy "cloudformation" namespace (will be deprecated soon)');
83-
this.code.openBlock('export namespace cloudformation');
84-
this.emitResourceType(legacyResourceName, resourceType, resourceName);
85-
this.emitPropertyTypes(name, legacyResourceName);
86-
this.code.closeBlock();
8778
}
8879
}
8980

‎tools/cfn2ts/lib/genspec.ts

-15
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { itemTypeNames, PropertyAttributeName, scalarTypeNames, SpecName } from
88
import util = require('./util');
99

1010
const RESOURCE_CLASS_PREFIX = 'Cfn';
11-
const LEGACY_RESOURCE_CLASS_POSTFIX = 'Resource';
1211

1312
export const CORE_NAMESPACE = 'cdk';
1413

@@ -25,20 +24,6 @@ export class CodeName {
2524
return new CodeName(packageName(specName), '', className, specName);
2625
}
2726

28-
public static forLegacyResource(specName: SpecName): CodeName {
29-
let className = specName.resourceName;
30-
31-
// add a "Resource" postfix to the class name (unless there is already a resource postfix).
32-
if (!className.endsWith(LEGACY_RESOURCE_CLASS_POSTFIX)) {
33-
className += LEGACY_RESOURCE_CLASS_POSTFIX;
34-
} else {
35-
// tslint:disable-next-line:no-console
36-
console.error('INFO: Resource class %s already had a %s postfix, so we didn\'t add one', className, LEGACY_RESOURCE_CLASS_POSTFIX);
37-
}
38-
39-
return new CodeName(packageName(specName), '', className, specName);
40-
}
41-
4227
public static forResourceProperties(resourceName: CodeName): CodeName {
4328
return new CodeName(resourceName.packageName, resourceName.namespace, `${resourceName.className}Props`, resourceName.specName);
4429
}

0 commit comments

Comments
 (0)