fix(cdk): only make Outputs Exports when necessary (#1624)

rix0rrr · web-flow · commit ebb8aa1b43e4 · 2019-02-05T17:37:03.000+01:00
Export names must be unique and can conflict, so automatically turning every Output into an Export can lead to problems for customers who deploy the same template multiple times. Especially when the outputs are created for them and they have no control over them. We'll turn Outputs into exports on-demand (when .makeImportValue() is called). Fixes #903, fixes #1611.
diff --git a/packages/@aws-cdk/assets/test/integ.assets.refs.lit.expected.json b/packages/@aws-cdk/assets/test/integ.assets.refs.lit.expected.json
@@ -13,9 +13,6 @@
     "S3BucketName": {
       "Value": {
         "Ref": "SampleAssetS3BucketE6B2908E"
-      },
-      "Export": {
-        "Name": "aws-cdk-asset-refs:S3BucketName"
       }
     },
     "S3ObjectKey": {
@@ -51,9 +48,6 @@
             }
           ]
         ]
-      },
-      "Export": {
-        "Name": "aws-cdk-asset-refs:S3ObjectKey"
       }
     },
     "S3URL": {
@@ -102,9 +96,6 @@
             }
           ]
         ]
-      },
-      "Export": {
-        "Name": "aws-cdk-asset-refs:S3URL"
       }
     }
   },
@@ -184,4 +175,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json
@@ -847,10 +847,7 @@
             "/"
           ]
         ]
-      },
-      "Export": {
-        "Name": "restapi-books-example:booksapiEndpointE230E8D5"
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.defaults.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.defaults.expected.json
@@ -120,10 +120,7 @@
             "/"
           ]
         ]
-      },
-      "Export": {
-        "Name": "test-apigateway-restapi-defaults:myapiEndpoint3628AFE3"
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json
@@ -612,10 +612,7 @@
             "/"
           ]
         ]
-      },
-      "Export": {
-        "Name": "test-apigateway-restapi:myapiEndpoint3628AFE3"
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-apigateway/test/test.restapi.ts b/packages/@aws-cdk/aws-apigateway/test/test.restapi.ts
@@ -92,8 +92,7 @@ export = {
               { Ref: "myapiDeploymentStageprod298F01AF" },
               "/"
             ]]
-          },
-          Export: { Name: "myapiEndpoint3628AFE3" }
+          }
         }
       }
     });
diff --git a/packages/@aws-cdk/aws-cloudformation/test/integ.trivial-lambda-resource.expected.json b/packages/@aws-cdk/aws-cloudformation/test/integ.trivial-lambda-resource.expected.json
@@ -72,9 +72,6 @@
           "DemoResource5B5C546C",
           "Response"
         ]
-      },
-      "Export": {
-        "Name": "SucceedingStack:ResponseMessage"
       }
     }
   }
diff --git a/packages/@aws-cdk/aws-ec2/test/integ.import-default-vpc.expected.json b/packages/@aws-cdk/aws-ec2/test/integ.import-default-vpc.expected.json
diff --git a/packages/@aws-cdk/aws-ec2/test/integ.import-default-vpc.lit.expected.json b/packages/@aws-cdk/aws-ec2/test/integ.import-default-vpc.lit.expected.json
@@ -18,16 +18,10 @@
   },
   "Outputs": {
     "PublicSubnets": {
-      "Value": "ids:subnet-e19455ca,subnet-e0c24797,subnet-ccd77395",
-      "Export": {
-        "Name": "aws-cdk-ec2-import:PublicSubnets"
-      }
+      "Value": "ids:subnet-e19455ca,subnet-e0c24797,subnet-ccd77395"
     },
     "PrivateSubnets": {
-      "Value": "ids:",
-      "Export": {
-        "Name": "aws-cdk-ec2-import:PrivateSubnets"
-      }
+      "Value": "ids:"
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-ecr/test/integ.basic.expected.json b/packages/@aws-cdk/aws-ecr/test/integ.basic.expected.json
@@ -54,10 +54,7 @@
             }
           ]
         ]
-      },
-      "Export": {
-        "Name": "aws-ecr-integ-stack:RepositoryURI"
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-awsvpc-nw.expected.json b/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-awsvpc-nw.expected.json
@@ -953,9 +953,6 @@
           "LB8A12904C",
           "DNSName"
         ]
-      },
-      "Export": {
-        "Name": "aws-ecs-integ:LoadBalancerDNS"
       }
     }
   }
diff --git a/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-bridge-nw.expected.json b/packages/@aws-cdk/aws-ecs/test/ec2/integ.lb-bridge-nw.expected.json
@@ -916,9 +916,6 @@
           "LB8A12904C",
           "DNSName"
         ]
-      },
-      "Export": {
-        "Name": "aws-ecs-integ-ecs:LoadBalancerDNS"
       }
     }
   }
diff --git a/packages/@aws-cdk/aws-ecs/test/fargate/integ.asset-image.expected.json b/packages/@aws-cdk/aws-ecs/test/fargate/integ.asset-image.expected.json
@@ -1002,9 +1002,6 @@
           "FargateServiceLBB353E155",
           "DNSName"
         ]
-      },
-      "Export": {
-        "Name": "aws-ecs-integ:FargateServiceLoadBalancerDNS9433D5F6"
       }
     },
     "LoadBalancerDNS": {
@@ -1013,9 +1010,6 @@
           "FargateServiceLBB353E155",
           "DNSName"
         ]
-      },
-      "Export": {
-        "Name": "aws-ecs-integ:LoadBalancerDNS"
       }
     }
   }
diff --git a/packages/@aws-cdk/aws-ecs/test/fargate/integ.l3.expected.json b/packages/@aws-cdk/aws-ecs/test/fargate/integ.l3.expected.json
@@ -675,9 +675,6 @@
           "L3LB212FC0E0",
           "DNSName"
         ]
-      },
-      "Export": {
-        "Name": "aws-ecs-integ:L3LoadBalancerDNSC6CB4A70"
       }
     }
   }
diff --git a/packages/@aws-cdk/aws-ecs/test/fargate/integ.lb-awsvpc-nw.expected.json b/packages/@aws-cdk/aws-ecs/test/fargate/integ.lb-awsvpc-nw.expected.json
@@ -668,9 +668,6 @@
           "LB8A12904C",
           "DNSName"
         ]
-      },
-      "Export": {
-        "Name": "aws-ecs-integ:LoadBalancerDNS"
       }
     }
   }
diff --git a/packages/@aws-cdk/aws-route53/test/integ.route53.expected.json b/packages/@aws-cdk/aws-route53/test/integ.route53.expected.json
@@ -551,18 +551,12 @@
     "PrivateZoneId": {
       "Value": {
         "Ref": "PrivateZone27242E85"
-      },
-      "Export": {
-        "Name": "aws-cdk-route53-integ:PrivateZoneId"
       }
     },
     "PublicZoneId": {
       "Value": {
         "Ref": "PublicZone2E1C4E34"
-      },
-      "Export": {
-        "Name": "aws-cdk-route53-integ:PublicZoneId"
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket-sharing.lit.expected.json b/packages/@aws-cdk/aws-s3/test/integ.bucket-sharing.lit.expected.json
@@ -69,4 +69,4 @@
       }
     }
   }
-]
+]
diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.domain-name.expected.json b/packages/@aws-cdk/aws-s3/test/integ.bucket.domain-name.expected.json
@@ -8,16 +8,10 @@
     "RealBucketDomain": {
       "Value": {
         "Fn::GetAtt":["MyBucketF68F3FF0","DomainName"]
-      },
-      "Export": {
-        "Name": "aws-cdk-s3-urls:RealBucketDomain"
       }
     },
     "ImportedBucketDomain": {
-      "Value": "my-bucket-test.s3.amazonaws.com",
-      "Export": {
-        "Name": "aws-cdk-s3-urls:ImportedBucketDomain"
-      }
+      "Value": "my-bucket-test.s3.amazonaws.com"
     }
   }
 }
diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.url.lit.expected.json b/packages/@aws-cdk/aws-s3/test/integ.bucket.url.lit.expected.json
@@ -24,9 +24,6 @@
             }
           ]
         ]
-      },
-      "Export": {
-        "Name": "aws-cdk-s3-urls:BucketURL"
       }
     },
     "ObjectURL": {
@@ -49,9 +46,6 @@
             "/myfolder/myfile.txt"
           ]
         ]
-      },
-      "Export": {
-        "Name": "aws-cdk-s3-urls:ObjectURL"
       }
     }
   }
diff --git a/packages/@aws-cdk/aws-s3/test/test.bucket.ts b/packages/@aws-cdk/aws-s3/test/test.bucket.ts
@@ -989,9 +989,7 @@ export = {
             "WebsiteURL"
           ]
         },
-        "Export": {
-          "Name": "MyBucketWebsiteURL9C222788"
-        }
+        "Export": {"Name": "MyBucketWebsiteURL9C222788"}
       }
       }
     });
@@ -1083,9 +1081,6 @@ export = {
           ]
         ]
         },
-        "Export": {
-        "Name": "BucketURL"
-        }
       },
       "MyFileURL": {
         "Value": {
@@ -1107,9 +1102,6 @@ export = {
           "/my/file.txt"
           ]
         ]
-        },
-        "Export": {
-        "Name": "MyFileURL"
         }
       },
       "YourFileURL": {
@@ -1133,9 +1125,6 @@ export = {
           ]
         ]
         },
-        "Export": {
-        "Name": "YourFileURL"
-        }
       }
       }
     });
diff --git a/packages/@aws-cdk/aws-sqs/test/integ.sqs.expected.json b/packages/@aws-cdk/aws-sqs/test/integ.sqs.expected.json
@@ -28,10 +28,7 @@
     "QueueUrl": {
       "Value": {
         "Ref": "Queue4A7E3555"
-      },
-      "Export": {
-        "Name": "aws-cdk-sqs:QueueUrl"
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-ssm/test/integ.parameter.lit.expected.json b/packages/@aws-cdk/aws-ssm/test/integ.parameter.lit.expected.json
@@ -111,10 +111,7 @@
             ]
           }
         ]
-      },
-      "Export": {
-        "Name": "SSM-Parameter:StringListOutput"
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-tokens.ts b/packages/@aws-cdk/cdk/lib/cloudformation/cfn-tokens.ts
@@ -102,7 +102,7 @@ export class CfnReference extends Token {
 
     // We want to return an actual FnImportValue Token here, but Fn.importValue() returns a 'string',
     // so construct one in-place.
-    return new Token({ 'Fn::ImportValue': output.export });
+    return new Token({ 'Fn::ImportValue': output.obtainExportName() });
   }
 
 }
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/output.ts b/packages/@aws-cdk/cdk/lib/cloudformation/output.ts
diff --git a/packages/@aws-cdk/cdk/test/cloudformation/test.output.ts b/packages/@aws-cdk/cdk/test/cloudformation/test.output.ts

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@`
`13`	`13`	`"S3BucketName": {`
`14`	`14`	`"Value": {`
`15`	`15`	`"Ref": "SampleAssetS3BucketE6B2908E"`
`16`		`- },`
`17`		`- "Export": {`
`18`		`- "Name": "aws-cdk-asset-refs:S3BucketName"`
`19`	`16`	`}`
`20`	`17`	`},`
`21`	`18`	`"S3ObjectKey": {`
`@@ -51,9 +48,6 @@`
`51`	`48`	`}`
`52`	`49`	`]`
`53`	`50`	`]`
`54`		`- },`
`55`		`- "Export": {`
`56`		`- "Name": "aws-cdk-asset-refs:S3ObjectKey"`
`57`	`51`	`}`
`58`	`52`	`},`
`59`	`53`	`"S3URL": {`
`@@ -102,9 +96,6 @@`
`102`	`96`	`}`
`103`	`97`	`]`
`104`	`98`	`]`
`105`		`- },`
`106`		`- "Export": {`
`107`		`- "Name": "aws-cdk-asset-refs:S3URL"`
`108`	`99`	`}`
`109`	`100`	`}`
`110`	`101`	`},`
`@@ -184,4 +175,4 @@`
`184`	`175`	`}`
`185`	`176`	`}`
`186`	`177`	`}`
`187`		`-}`
	`178`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -847,10 +847,7 @@`
`847`	`847`	`"/"`
`848`	`848`	`]`
`849`	`849`	`]`
`850`		`- },`
`851`		`- "Export": {`
`852`		`- "Name": "restapi-books-example:booksapiEndpointE230E8D5"`
`853`	`850`	`}`
`854`	`851`	`}`
`855`	`852`	`}`
`856`		`-}`
	`853`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -120,10 +120,7 @@`
`120`	`120`	`"/"`
`121`	`121`	`]`
`122`	`122`	`]`
`123`		`- },`
`124`		`- "Export": {`
`125`		`- "Name": "test-apigateway-restapi-defaults:myapiEndpoint3628AFE3"`
`126`	`123`	`}`
`127`	`124`	`}`
`128`	`125`	`}`
`129`		`-}`
	`126`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -612,10 +612,7 @@`
`612`	`612`	`"/"`
`613`	`613`	`]`
`614`	`614`	`]`
`615`		`- },`
`616`		`- "Export": {`
`617`		`- "Name": "test-apigateway-restapi:myapiEndpoint3628AFE3"`
`618`	`615`	`}`
`619`	`616`	`}`
`620`	`617`	`}`
`621`		`-}`
	`618`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,7 @@ export = {`
`92`	`92`	`{ Ref: "myapiDeploymentStageprod298F01AF" },`
`93`	`93`	`"/"`
`94`	`94`	`]]`
`95`		`- },`
`96`		`- Export: { Name: "myapiEndpoint3628AFE3" }`
	`95`	`+ }`
`97`	`96`	`}`
`98`	`97`	`}`
`99`	`98`	`});`
Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,6 @@`
`72`	`72`	`"DemoResource5B5C546C",`
`73`	`73`	`"Response"`
`74`	`74`	`]`
`75`		`- },`
`76`		`- "Export": {`
`77`		`- "Name": "SucceedingStack:ResponseMessage"`
`78`	`75`	`}`
`79`	`76`	`}`
`80`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,7 @@`
`54`	`54`	`}`
`55`	`55`	`]`
`56`	`56`	`]`
`57`		`- },`
`58`		`- "Export": {`
`59`		`- "Name": "aws-ecr-integ-stack:RepositoryURI"`
`60`	`57`	`}`
`61`	`58`	`}`
`62`	`59`	`}`
`63`		`-}`
	`60`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -953,9 +953,6 @@`
`953`	`953`	`"LB8A12904C",`
`954`	`954`	`"DNSName"`
`955`	`955`	`]`
`956`		`- },`
`957`		`- "Export": {`
`958`		`- "Name": "aws-ecs-integ:LoadBalancerDNS"`
`959`	`956`	`}`
`960`	`957`	`}`
`961`	`958`	`}`