refactor: name "toCloudFormation" internal (renamed to "_toCloudForma…

…tion") (aws#2047) The method `toCloudFormation` is not supposed to be directly called by users. Mark it as `@internal` and rename to `_toCloudFormation`. Fixes aws#2044 Related aws#2016 BREAKING CHANGE: “toCloudFormation” is now internal and should not be called directly. Instead use “app.synthesizeStack”
alex-berger · Mar 19, 2019 · 5aa4fc7 · 5aa4fc7
1 parent a0cbd24
commit 5aa4fc7
Show file tree

Hide file tree

Showing 36 changed files with 128 additions and 124 deletions.
diff --git a/packages/@aws-cdk/assert/lib/expect.ts b/packages/@aws-cdk/assert/lib/expect.ts
@@ -20,7 +20,7 @@ export function expect(stack: api.SynthesizedStack | cdk.Stack, skipValidation =
 
     sstack = {
       name: stack.name,
-      template: stack.toCloudFormation(),
+      template: stack._toCloudFormation(),
       metadata: collectStackMetadata(stack.node),
       environment: {
         name: 'test',
@@ -36,7 +36,7 @@ export function expect(stack: api.SynthesizedStack | cdk.Stack, skipValidation =
 }
 
 function isStackClassInstance(x: api.SynthesizedStack | cdk.Stack): x is cdk.Stack {
-  return 'toCloudFormation' in x;
+  return '_toCloudFormation' in x;
 }
 
 function collectStackMetadata(root: cdk.ConstructNode): api.StackMetadata {

diff --git a/packages/@aws-cdk/assets-docker/test/test.image-asset.ts b/packages/@aws-cdk/assets-docker/test/test.image-asset.ts
@@ -18,7 +18,7 @@ export = {
     });
 
     // THEN
-    const template = stack.toCloudFormation();
+    const template = stack._toCloudFormation();
 
     test.deepEqual(template.Parameters.ImageImageName5E684353, {
       Type: 'String',

diff --git a/packages/@aws-cdk/assets/test/test.asset.ts b/packages/@aws-cdk/assets/test/test.asset.ts
@@ -30,7 +30,7 @@ export = {
     });
 
     // verify that now the template contains parameters for this asset
-    const template = stack.toCloudFormation();
+    const template = stack._toCloudFormation();
     test.equal(template.Parameters.MyAssetS3Bucket68C9B344.Type, 'String');
     test.equal(template.Parameters.MyAssetS3VersionKey68E1A45D.Type, 'String');
 
@@ -74,7 +74,7 @@ export = {
     });
 
     // verify that now the template contains parameters for this asset
-    const template = stack.toCloudFormation();
+    const template = stack._toCloudFormation();
     test.equal(template.Parameters.MyAssetS3Bucket68C9B344.Type, 'String');
     test.equal(template.Parameters.MyAssetS3VersionKey68E1A45D.Type, 'String');
 

diff --git a/packages/@aws-cdk/aws-apigateway/test/test.deployment.ts b/packages/@aws-cdk/aws-apigateway/test/test.deployment.ts
@@ -153,7 +153,7 @@ export = {
 
     function synthesize() {
       stack.node.prepareTree();
-      return stack.toCloudFormation();
+      return stack._toCloudFormation();
     }
   },
 

diff --git a/packages/@aws-cdk/aws-apigateway/test/test.restapi.ts b/packages/@aws-cdk/aws-apigateway/test/test.restapi.ts
@@ -344,7 +344,7 @@ export = {
 
     // THEN
     stack.node.prepareTree();
-    test.deepEqual(stack.toCloudFormation().Outputs.MyRestApiRestApiIdB93C5C2D, {
+    test.deepEqual(stack._toCloudFormation().Outputs.MyRestApiRestApiIdB93C5C2D, {
       Value: { Ref: 'MyRestApi2D1F47A9' },
       Export: { Name: 'MyRestApiRestApiIdB93C5C2D' }
     });

diff --git a/packages/@aws-cdk/aws-applicationautoscaling/test/test.step-scaling-policy.ts b/packages/@aws-cdk/aws-applicationautoscaling/test/test.step-scaling-policy.ts
@@ -129,7 +129,7 @@ function setupStepScaling(intervals: appscaling.ScalingInterval[]) {
     scalingSteps: intervals
   });
 
-  return new ScalingStackTemplate(stack.toCloudFormation());
+  return new ScalingStackTemplate(stack._toCloudFormation());
 }
 
 class ScalingStackTemplate {

diff --git a/packages/@aws-cdk/aws-cloudtrail/test/test.cloudtrail.ts b/packages/@aws-cdk/aws-cloudtrail/test/test.cloudtrail.ts
@@ -66,7 +66,7 @@ export = {
       expect(stack).to(haveResource("AWS::S3::Bucket"));
       expect(stack).to(haveResource("AWS::S3::BucketPolicy", ExpectedBucketPolicyProperties));
       expect(stack).to(not(haveResource("AWS::Logs::LogGroup")));
-      const trail: any = stack.toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
+      const trail: any = stack._toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
       test.deepEqual(trail.DependsOn, ['MyAmazingCloudTrailS3Policy39C120B0']);
       test.done();
     },
@@ -97,7 +97,7 @@ export = {
           PolicyName: logsRolePolicyName,
           Roles: [{ Ref: 'MyAmazingCloudTrailLogsRoleF2CCF977' }],
         }));
-        const trail: any = stack.toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
+        const trail: any = stack._toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
         test.deepEqual(trail.DependsOn, [logsRolePolicyName, logsRoleName, 'MyAmazingCloudTrailS3Policy39C120B0']);
         test.done();
       },
@@ -116,7 +116,7 @@ export = {
         expect(stack).to(haveResource("AWS::Logs::LogGroup", {
           RetentionInDays: 7
         }));
-        const trail: any = stack.toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
+        const trail: any = stack._toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
         test.deepEqual(trail.DependsOn, [logsRolePolicyName, logsRoleName, 'MyAmazingCloudTrailS3Policy39C120B0']);
         test.done();
       },
@@ -134,7 +134,7 @@ export = {
         expect(stack).to(not(haveResource("AWS::Logs::LogGroup")));
         expect(stack).to(not(haveResource("AWS::IAM::Role")));
 
-        const trail: any = stack.toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
+        const trail: any = stack._toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
         test.equals(trail.Properties.EventSelectors.length, 1);
         const selector = trail.Properties.EventSelectors[0];
         test.equals(selector.ReadWriteType, null, "Expected selector read write type to be undefined");
@@ -160,7 +160,7 @@ export = {
         expect(stack).to(not(haveResource("AWS::Logs::LogGroup")));
         expect(stack).to(not(haveResource("AWS::IAM::Role")));
 
-        const trail: any = stack.toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
+        const trail: any = stack._toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
         test.equals(trail.Properties.EventSelectors.length, 1);
         const selector = trail.Properties.EventSelectors[0];
         test.equals(selector.ReadWriteType, "ReadOnly", "Expected selector read write type to be Read");
@@ -179,7 +179,7 @@ export = {
 
         new CloudTrail(stack, 'MyAmazingCloudTrail', { managementEvents: ReadWriteType.WriteOnly });
 
-        const trail: any = stack.toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
+        const trail: any = stack._toCloudFormation().Resources.MyAmazingCloudTrail54516E8D;
         test.equals(trail.Properties.EventSelectors.length, 1);
         const selector = trail.Properties.EventSelectors[0];
         test.equals(selector.ReadWriteType, "WriteOnly", "Expected selector read write type to be All");

diff --git a/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts
@@ -355,7 +355,7 @@ export = {
       });
 
       test.throws(() => {
-        stack.toCloudFormation();
+        stack._toCloudFormation();
       }, /deploymentInAlarm/);
 
       test.done();

diff --git a/packages/@aws-cdk/aws-codepipeline/test/test.pipeline.ts b/packages/@aws-cdk/aws-codepipeline/test/test.pipeline.ts
@@ -45,7 +45,7 @@ export = {
       ],
     });
 
-    test.notDeepEqual(stack.toCloudFormation(), {});
+    test.notDeepEqual(stack._toCloudFormation(), {});
     test.deepEqual([], pipeline.node.validateTree());
     test.done();
   },

diff --git a/packages/@aws-cdk/aws-iam/test/test.role.ts b/packages/@aws-cdk/aws-iam/test/test.role.ts
@@ -87,10 +87,10 @@ export = {
       assumedBy: new ServicePrincipal('sns.amazonaws.com')
     });
 
-    test.ok(!('MyRoleDefaultPolicyA36BE1DD' in stack.toCloudFormation().Resources), 'initially created without a policy');
+    test.ok(!('MyRoleDefaultPolicyA36BE1DD' in stack._toCloudFormation().Resources), 'initially created without a policy');
 
     role.addToPolicy(new PolicyStatement().addResource('myresource').addAction('myaction'));
-    test.ok(stack.toCloudFormation().Resources.MyRoleDefaultPolicyA36BE1DD, 'policy resource created');
+    test.ok(stack._toCloudFormation().Resources.MyRoleDefaultPolicyA36BE1DD, 'policy resource created');
 
     expect(stack).toMatch({ Resources:
       { MyRoleF48FFE04:

diff --git a/packages/@aws-cdk/aws-s3/test/test.bucket.ts b/packages/@aws-cdk/aws-s3/test/test.bucket.ts
@@ -444,7 +444,7 @@ export = {
       test.deepEqual(bucket.bucketArn, bucketArn);
       test.deepEqual(bucket.node.resolve(bucket.bucketName), 'my-bucket');
 
-      test.deepEqual(stack.toCloudFormation(), {}, 'the ref is not a real resource');
+      test.deepEqual(stack._toCloudFormation(), {}, 'the ref is not a real resource');
       test.done();
     },
 
@@ -925,7 +925,7 @@ export = {
     bucket.grantWrite(writer);
     bucket.grantDelete(deleter);
 
-    const resources = stack.toCloudFormation().Resources;
+    const resources = stack._toCloudFormation().Resources;
     const actions = (id: string) => resources[id].Properties.PolicyDocument.Statement[0].Action;
 
     test.deepEqual(actions('WriterDefaultPolicyDC585BCE'), [ 's3:DeleteObject*', 's3:PutObject*', 's3:Abort*' ]);

diff --git a/packages/@aws-cdk/aws-s3/test/test.notifications.ts b/packages/@aws-cdk/aws-s3/test/test.notifications.ts
@@ -307,7 +307,7 @@ export = {
     bucket.onObjectCreated(dest);
 
     stack.node.prepareTree();
-    test.deepEqual(stack.toCloudFormation().Resources.BucketNotifications8F2E257D, {
+    test.deepEqual(stack._toCloudFormation().Resources.BucketNotifications8F2E257D, {
       Type: 'Custom::S3BucketNotifications',
       Properties: {
         ServiceToken: { 'Fn::GetAtt': [ 'BucketNotificationsHandler050a0587b7544547bf325f094a3db8347ECC3691', 'Arn' ] },

diff --git a/packages/@aws-cdk/aws-sqs/test/test.sqs.ts b/packages/@aws-cdk/aws-sqs/test/test.sqs.ts
@@ -107,7 +107,7 @@ export = {
     test.deepEqual(stack.node.resolve(imports.queueUrl), { 'Fn::ImportValue': 'QueueQueueUrlC30FF916' });
 
     // the exporting stack has Outputs for QueueARN and QueueURL
-    const outputs = stack.toCloudFormation().Outputs;
+    const outputs = stack._toCloudFormation().Outputs;
     test.deepEqual(outputs.QueueQueueArn8CF496D5, { Value: { 'Fn::GetAtt': [ 'Queue4A7E3555', 'Arn' ] }, Export: { Name: 'QueueQueueArn8CF496D5' } });
     test.deepEqual(outputs.QueueQueueUrlC30FF916, { Value: { Ref: 'Queue4A7E3555' }, Export: { Name: 'QueueQueueUrlC30FF916' } });
 
@@ -252,7 +252,7 @@ export = {
           keyArn: { 'Fn::ImportValue': 'QueueWithCustomKeyKeyArn537F6E42' }
         });
 
-        test.deepEqual(stack.toCloudFormation().Outputs, {
+        test.deepEqual(stack._toCloudFormation().Outputs, {
           "QueueWithCustomKeyQueueArnD326BB9B": {
           "Value": {
             "Fn::GetAtt": [
@@ -300,7 +300,7 @@ export = {
           keyArn: { 'Fn::ImportValue': 'QueueWithManagedKeyKeyArn9C42A85D' }
         });
 
-        test.deepEqual(stack.toCloudFormation().Outputs, {
+        test.deepEqual(stack._toCloudFormation().Outputs, {
           "QueueWithManagedKeyQueueArn8798A14E": {
           "Value": {
             "Fn::GetAtt": [
@@ -406,7 +406,7 @@ export = {
 
       // make sure the queue policy is added as a dependency to the bucket
       // notifications resource so it will be created first.
-      test.deepEqual(stack.toCloudFormation().Resources.BucketNotifications8F2E257D.DependsOn, [ 'QueuePolicy25439813' ]);
+      test.deepEqual(stack._toCloudFormation().Resources.BucketNotifications8F2E257D.DependsOn, [ 'QueuePolicy25439813' ]);
 
       test.done();
     },

diff --git a/packages/@aws-cdk/cdk/lib/cfn-condition.ts b/packages/@aws-cdk/cdk/lib/cfn-condition.ts
@@ -25,7 +25,7 @@ export class CfnCondition extends CfnRefElement implements ICfnConditionExpressi
     this.expression = props && props.expression;
   }
 
-  public toCloudFormation(): object {
+  public _toCloudFormation(): object {
     if (!this.expression) {
       return { };
     }

diff --git a/packages/@aws-cdk/cdk/lib/cfn-element.ts b/packages/@aws-cdk/cdk/lib/cfn-element.ts
@@ -17,7 +17,7 @@ export abstract class CfnElement extends Construct {
    * @returns The construct as a stack element or undefined if it is not a stack element.
    */
   public static isCfnElement(construct: IConstruct): construct is CfnElement {
-    return ('logicalId' in construct && 'toCloudFormation' in construct);
+    return ('logicalId' in construct && '_toCloudFormation' in construct);
   }
 
   /**
@@ -100,8 +100,10 @@ export abstract class CfnElement extends Construct {
    *     }
    *   }
    * }
+   *
+   * @internal
    */
-  public abstract toCloudFormation(): object;
+  public abstract _toCloudFormation(): object;
 
   /**
    * Automatically detect references in this CfnElement
@@ -117,7 +119,7 @@ export abstract class CfnElement extends Construct {
       // This does make the assumption that the error will not be rectified,
       // but the error will be thrown later on anyway. If the error doesn't
       // get thrown down the line, we may miss references.
-      this.node.recordReference(...findTokens(this, () => this.toCloudFormation()));
+      this.node.recordReference(...findTokens(this, () => this._toCloudFormation()));
     } catch (e) {
       if (e.type !== 'CfnSynthesisError') { throw e; }
     }

diff --git a/packages/@aws-cdk/cdk/lib/cfn-mapping.ts b/packages/@aws-cdk/cdk/lib/cfn-mapping.ts
@@ -43,7 +43,7 @@ export class CfnMapping extends CfnRefElement {
     return Fn.findInMap(this.logicalId, key1, key2);
   }
 
-  public toCloudFormation(): object {
+  public _toCloudFormation(): object {
     return {
       Mappings: {
         [this.logicalId]: this.mapping

diff --git a/packages/@aws-cdk/cdk/lib/cfn-output.ts b/packages/@aws-cdk/cdk/lib/cfn-output.ts
@@ -111,7 +111,7 @@ export class CfnOutput extends CfnElement {
     return fn().importValue(this.obtainExportName());
   }
 
-  public toCloudFormation(): object {
+  public _toCloudFormation(): object {
     return {
       Outputs: {
         [this.logicalId]: {

diff --git a/packages/@aws-cdk/cdk/lib/cfn-parameter.ts b/packages/@aws-cdk/cdk/lib/cfn-parameter.ts
@@ -104,7 +104,7 @@ export class CfnParameter extends CfnRefElement {
     this.stringListValue = this.value.toList();
   }
 
-  public toCloudFormation(): object {
+  public _toCloudFormation(): object {
     return {
       Parameters: {
         [this.logicalId]: {

diff --git a/packages/@aws-cdk/cdk/lib/cfn-resource.ts b/packages/@aws-cdk/cdk/lib/cfn-resource.ts
@@ -206,7 +206,7 @@ export class CfnResource extends CfnRefElement {
   /**
    * Emits CloudFormation for this resource.
    */
-  public toCloudFormation(): object {
+  public _toCloudFormation(): object {
     try {
       // merge property overrides onto properties and then render (and validate).
       const tags = CfnResource.isTaggable(this) ? this.tags.renderTags() : undefined;

diff --git a/packages/@aws-cdk/cdk/lib/cfn-rule.ts b/packages/@aws-cdk/cdk/lib/cfn-rule.ts
@@ -92,7 +92,7 @@ export class CfnRule extends CfnRefElement {
     });
   }
 
-  public toCloudFormation(): object {
+  public _toCloudFormation(): object {
     return {
       Rules: {
         [this.logicalId]: {

diff --git a/packages/@aws-cdk/cdk/lib/include.ts b/packages/@aws-cdk/cdk/lib/include.ts
@@ -31,7 +31,7 @@ export class Include extends CfnElement {
     this.template = props.template;
   }
 
-  public toCloudFormation() {
+  public _toCloudFormation() {
     return this.template;
   }
 }
diff --git a/packages/@aws-cdk/cdk/lib/stack.ts b/packages/@aws-cdk/cdk/lib/stack.ts
@@ -143,9 +143,11 @@ export class Stack extends Construct {
 
   /**
    * Returns the CloudFormation template for this stack by traversing
-   * the tree and invoking toCloudFormation() on all Entity objects.
+   * the tree and invoking _toCloudFormation() on all Entity objects.
+   *
+   * @internal
    */
-  public toCloudFormation() {
+  public _toCloudFormation() {
     // before we begin synthesis, we shall lock this stack, so children cannot be added
     this.node.lock();
 
@@ -158,7 +160,7 @@ export class Stack extends Construct {
       };
 
       const elements = cfnElements(this);
-      const fragments = elements.map(e => this.node.resolve(e.toCloudFormation()));
+      const fragments = elements.map(e => this.node.resolve(e._toCloudFormation()));
 
       // merge in all CloudFormation fragments collected from the tree
       for (const fragment of fragments) {
@@ -446,7 +448,7 @@ export class Stack extends Construct {
     const template = `${this.node.id}.template.json`;
 
     // write the CloudFormation template as a JSON file
-    session.store.writeJson(template, this.toCloudFormation());
+    session.store.writeJson(template, this._toCloudFormation());
 
     const artifact: cxapi.Artifact = {
       type: cxapi.ArtifactType.AwsCloudFormationStack,

diff --git a/packages/@aws-cdk/cdk/test/test.arn.ts b/packages/@aws-cdk/cdk/test/test.arn.ts
@@ -219,7 +219,7 @@ export = {
     new CfnOutput(stack2, 'SomeValue', { value: arn });
 
     // THEN
-    test.deepEqual(stack2.node.resolve(stack2.toCloudFormation()), {
+    test.deepEqual(stack2.node.resolve(stack2._toCloudFormation()), {
       Outputs: {
         SomeValue: {
           Value: {

diff --git a/packages/@aws-cdk/cdk/test/test.condition.ts b/packages/@aws-cdk/cdk/test/test.condition.ts
@@ -16,7 +16,7 @@ export = {
     });
 
     // THEN
-    test.deepEqual(stack.toCloudFormation(), {
+    test.deepEqual(stack._toCloudFormation(), {
       Parameters: { Param1: { Type: 'String' } },
       Conditions: {
         Condition1: { 'Fn::Equals': [ 'a', 'b' ] },
@@ -45,7 +45,7 @@ export = {
 
     // THEN
     test.ok(cdk.unresolved(propValue));
-    test.deepEqual(stack.toCloudFormation(), {
+    test.deepEqual(stack._toCloudFormation(), {
       Resources: {
         MyResource: {
           Type: 'AWS::Foo::Bar',

diff --git a/packages/@aws-cdk/cdk/test/test.include.ts b/packages/@aws-cdk/cdk/test/test.include.ts
@@ -7,7 +7,7 @@ export = {
 
     new Include(stack, 'T1', { template: clone(template) });
 
-    test.deepEqual(stack.toCloudFormation(), {
+    test.deepEqual(stack._toCloudFormation(), {
       Parameters: { MyParam: { Type: 'String', Default: 'Hello' } },
       Resources: {
         MyResource1: { Type: 'ResourceType1', Properties: { P1: 1, P2: 2 } },
@@ -24,7 +24,7 @@ export = {
     new CfnOutput(stack, 'MyOutput', { description: 'Out!', disableExport: true });
     new CfnParameter(stack, 'MyParam2', { type: 'Integer' });
 
-    test.deepEqual(stack.toCloudFormation(), {
+    test.deepEqual(stack._toCloudFormation(), {
       Parameters: {
         MyParam: { Type: 'String', Default: 'Hello' },
         MyParam2: { Type: 'Integer' } },
@@ -46,7 +46,7 @@ export = {
     new CfnOutput(stack, 'MyOutput', { description: 'Out!' });
     new CfnParameter(stack, 'MyParam', { type: 'Integer' }); // duplicate!
 
-    test.throws(() => stack.toCloudFormation());
+    test.throws(() => stack._toCloudFormation());
     test.done();
   },
 };