Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: stop generating legacy cloudformation resources #1493

Merged
merged 1 commit into from
Jan 8, 2019
Merged

feat: stop generating legacy cloudformation resources #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-codepipeline/lib/custom-action-registration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import cpapi = require('@aws-cdk/aws-codepipeline-api');
import cdk = require('@aws-cdk/cdk');
import { cloudformation } from './codepipeline.generated';
import { CfnCustomActionType } from './codepipeline.generated';

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

new cloudformation.CustomActionTypeResource(this, 'Resource', {
new CfnCustomActionType(this, 'Resource', {
category: props.category,
inputArtifactDetails: {
minimumCount: props.artifactBounds.minInputs,
Expand Down
24 changes: 0 additions & 24 deletions packages/@aws-cdk/aws-iam/test/test.legacy-resources.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions tools/cfn2ts/lib/codegen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,10 @@ export default class CodeGenerator {

const cfnName = SpecName.parse(name);
const resourceName = genspec.CodeName.forCfnResource(cfnName);
const legacyResourceName = genspec.CodeName.forLegacyResource(cfnName);
this.code.line();

this.emitResourceType(resourceName, resourceType);
this.emitPropertyTypes(name, resourceName);

// emit the "cloudformation.XxxResource" classes for backwards compatibility
// those will also include a deprecation warning.
this.code.line('// legacy "cloudformation" namespace (will be deprecated soon)');
this.code.openBlock('export namespace cloudformation');
this.emitResourceType(legacyResourceName, resourceType, resourceName);
this.emitPropertyTypes(name, legacyResourceName);
this.code.closeBlock();
}
}

Expand Down
15 changes: 0 additions & 15 deletions tools/cfn2ts/lib/genspec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { itemTypeNames, PropertyAttributeName, scalarTypeNames, SpecName } from
import util = require('./util');

const RESOURCE_CLASS_PREFIX = 'Cfn';
const LEGACY_RESOURCE_CLASS_POSTFIX = 'Resource';

export const CORE_NAMESPACE = 'cdk';

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

public static forLegacyResource(specName: SpecName): CodeName {
let className = specName.resourceName;

// add a "Resource" postfix to the class name (unless there is already a resource postfix).
if (!className.endsWith(LEGACY_RESOURCE_CLASS_POSTFIX)) {
className += LEGACY_RESOURCE_CLASS_POSTFIX;
} else {
// tslint:disable-next-line:no-console
console.error('INFO: Resource class %s already had a %s postfix, so we didn\'t add one', className, LEGACY_RESOURCE_CLASS_POSTFIX);
}

return new CodeName(packageName(specName), '', className, specName);
}

public static forResourceProperties(resourceName: CodeName): CodeName {
return new CodeName(resourceName.packageName, resourceName.namespace, `${resourceName.className}Props`, resourceName.specName);
}
Expand Down