interim example of l2 renaming instead of remapping attrs for iam

packages/@aws-cdk/aws-iam/lib/group.ts

@@ -67,7 +67,7 @@ export class Group extends Resource implements IIdentity {
     });
 
     this.groupName = group.groupName;
-    this.groupArn = group.groupArn;
+    this.groupArn = group.attrArn;
     this.policyFragment = new ArnPrincipal(this.groupArn).policyFragment;
   }
 

packages/@aws-cdk/aws-iam/lib/lazy-role.ts

@@ -76,12 +76,12 @@ export class LazyRole extends cdk.Construct implements IRole {
   /**
    * Returns the ARN of this role.
    */
-  public get roleArn(): string {
-    return this.instantiate().roleArn;
+  public get attrArn(): string {
+    return this.instantiate().attrArn;
   }
 
-  public get roleId(): string {
-    return this.instantiate().roleId;
+  public get attrRoleId(): string {
+    return this.instantiate().attrRoleId;
   }
 
   public get roleName(): string {

packages/@aws-cdk/aws-iam/lib/role.ts

@@ -113,13 +113,13 @@ export class Role extends Resource implements IRole {
   /**
    * Returns the ARN of this role.
    */
-  public readonly roleArn: string;
+  public readonly attrArn: string;
 
   /**
    * Returns the stable and unique string identifying the role. For example,
    * AIDAJQABLZS4A3QDU576Q.
    */
-  public readonly roleId: string;
+  public readonly attrRoleId: string;
 
   /**
    * Returns the name of the role.
@@ -152,10 +152,10 @@ export class Role extends Resource implements IRole {
       maxSessionDuration: props.maxSessionDurationSec,
     });
 
-    this.roleId = role.roleId;
-    this.roleArn = role.roleArn;
+    this.attrRoleId = role.attrRoleId;
+    this.attrArn = role.attrArn;
     this.roleName = role.roleName;
-    this.policyFragment = new ArnPrincipal(this.roleArn).policyFragment;
+    this.policyFragment = new ArnPrincipal(this.attrArn).policyFragment;
 
     function _flatten(policies?: { [name: string]: PolicyDocument }) {
       if (policies == null || Object.keys(policies).length === 0) {
@@ -172,8 +172,8 @@ export class Role extends Resource implements IRole {
 
   public export(): RoleImportProps {
     return {
-      roleArn: new CfnOutput(this, 'RoleArn', { value: this.roleArn }).makeImportValue(),
-      roleId: new CfnOutput(this, 'RoleId', { value: this.roleId }).makeImportValue()
+      roleArn: new CfnOutput(this, 'RoleArn', { value: this.attrArn }).makeImportValue(),
+      roleId: new CfnOutput(this, 'RoleId', { value: this.attrRoleId }).makeImportValue()
     };
   }
 
@@ -215,7 +215,7 @@ export class Role extends Resource implements IRole {
     return Grant.addToPrincipal({
       grantee,
       actions,
-      resourceArns: [this.roleArn],
+      resourceArns: [this.attrArn],
       scope: this
     });
   }
@@ -235,13 +235,13 @@ export interface IRole extends IIdentity {
   /**
    * Returns the ARN of this role.
    */
-  readonly roleArn: string;
+  readonly attrArn: string;
 
   /**
    * Returns the stable and unique string identifying the role. For example,
    * AIDAJQABLZS4A3QDU576Q.
    */
-  readonly roleId: string;
+  readonly attrRoleId: string;
 
   /**
    * Returns the name of this role.
@@ -313,26 +313,26 @@ class ImportedRole extends Construct implements IRole {
   public readonly grantPrincipal: IPrincipal = this;
   public readonly assumeRoleAction: string = 'sts:AssumeRole';
   public readonly policyFragment: PrincipalPolicyFragment;
-  public readonly roleArn: string;
+  public readonly attrArn: string;
 
   private readonly _roleId?: string;
 
   constructor(scope: Construct, id: string, private readonly props: RoleImportProps) {
     super(scope, id);
-    this.roleArn = props.roleArn;
+    this.attrArn = props.roleArn;
     this._roleId = props.roleId;
-    this.policyFragment = new ArnPrincipal(this.roleArn).policyFragment;
+    this.policyFragment = new ArnPrincipal(this.attrArn).policyFragment;
   }
 
-  public get roleId() {
+  public get attrRoleId() {
     if (!this._roleId) {
       throw new Error(`No roleId specified for imported role`);
     }
     return this._roleId;
   }
 
   public get roleName() {
-    return this.node.stack.parseArn(this.roleArn).resourceName!;
+    return this.node.stack.parseArn(this.attrArn).resourceName!;
   }
 
   public export() {
@@ -359,7 +359,7 @@ class ImportedRole extends Construct implements IRole {
     return Grant.addToPrincipal({
       grantee,
       actions,
-      resourceArns: [this.roleArn],
+      resourceArns: [this.attrArn],
       scope: this
     });
   }

packages/@aws-cdk/aws-iam/lib/user.ts

@@ -101,7 +101,7 @@ export class User extends Resource implements IIdentity {
     });
 
     this.userName = user.userName;
-    this.userArn = user.userArn;
+    this.userArn = user.attrArn;
     this.policyFragment = new ArnPrincipal(this.userArn).policyFragment;
 
     if (props.groups) {

packages/@aws-cdk/aws-iam/test/test.lazy-role.ts

@@ -25,7 +25,7 @@ export = nodeunit.testCase({
     // WHEN
     const roleArn = new iam.LazyRole(stack, 'Lazy', {
       assumedBy: new iam.ServicePrincipal('test.service')
-    }).roleArn;
+    }).attrArn;
 
     // THEN
     test.notEqual(roleArn, null);

packages/@aws-cdk/aws-iam/test/test.role.ts

@@ -269,8 +269,8 @@ export = {
       roleId: { 'Fn::ImportValue': 'Stack:MyRoleRoleIdF7B258D8' }
     });
 
-    test.deepEqual(stack.node.resolve(importedRole.roleArn), { 'Fn::ImportValue': 'Stack:MyRoleRoleArn3388B7E2' });
-    test.deepEqual(stack.node.resolve(importedRole.roleId), { 'Fn::ImportValue': 'Stack:MyRoleRoleIdF7B258D8' });
+    test.deepEqual(stack.node.resolve(importedRole.attrArn), { 'Fn::ImportValue': 'Stack:MyRoleRoleArn3388B7E2' });
+    test.deepEqual(stack.node.resolve(importedRole.attrRoleId), { 'Fn::ImportValue': 'Stack:MyRoleRoleIdF7B258D8' });
     test.deepEqual(stack.node.resolve(importedRole.roleName), {
       'Fn::Select': [ 1, {
         'Fn::Split': [ '/', {

tools/awslint/lib/rules/resource.ts

@@ -112,7 +112,11 @@ resourceLinter.add({
     const resourceAttributes = new Array<reflect.Property>();
     for (const attr of e.ctx.resource.attributes) {
       const attribute: reflect.Property | undefined = e.ctx.resourceInterface.ownProperties.find(p => p.name === attr);
+      // tslint:disable-next-line:no-console
+      e.ctx.resourceInterface.ownProperties.map(p => console.log(`name: ${p.name}, attr: ${attr}`));
       const scope: string = e.ctx.resourceInterface.fqn + '.' + attr;
+      // tslint:disable-next-line:no-console
+      console.log(`${scope} :: ${attribute}`);
       if (e.assert(attribute, scope)) {
         resourceAttributes.push(attribute);
       }
@@ -192,4 +196,4 @@ resourceLinter.add({
       });
     }
   }
-});
+});

tools/cfn2ts/lib/codegen.ts

@@ -249,21 +249,7 @@ export default class CodeGenerator {
       attributes.push(refAttr);
     }
 
-    // //
-    // // Ref attribute
-    // //
-    // if (spec.RefKind !== schema.SpecialRefKind.None) {
-    //   const refAttribute = genspec.refAttributeDefinition(resourceName, spec.RefKind!);
-    //
-    //   // If there's already an attribute with the same name, ref is not needed
-    //   if (!attributes.some(a => a.propertyName === refAttribute.propertyName)) {
-    //     this.code.line(`public readonly ${refAttribute.propertyName}Attr: ${refAttribute.attributeType};`);
-    //     attributes.push(refAttribute);
-    //   }
-    // }
-
     // set class properties to match CloudFormation Properties spec
-
     if (propsType) {
       this.emitPropsTypeProperties(resourceName, spec.Properties!, Container.Class);
     }

tools/cfn2ts/lib/genspec.ts

@@ -169,7 +169,8 @@ export function validatorName(typeName: CodeName): CodeName {
  */
 export function attributeDefinition(attributeName: string, spec: schema.Attribute): Attribute {
   const descriptiveName = attributeName.replace(/\./g, '');
-  const propertyName = `${cloudFormationToScriptName(descriptiveName)}Attr`;      // "bucketArn"
+  const suffixName = codemaker.toPascalCase(cloudFormationToScriptName(descriptiveName));
+  const propertyName = `attr${suffixName}`;      // "attrArn"
 
   let attrType: string;
   if ('PrimitiveType' in spec && spec.PrimitiveType === 'String') {
@@ -193,7 +194,7 @@ export function refAttributeDefinition(): Attribute {
 
   const constructorArguments = 'this.ref';
 
-  return new Attribute('refAttr', 'string', constructorArguments);
+  return new Attribute('attrRef', 'string', constructorArguments);
 }
 
 /**