Improve the Cosmos App example (pulumi#448)

* Clean up the CosmosApp component * Restore index
ronnylt · Oct 28, 2019 · b953ac8 · b953ac8
1 parent d158d0c
commit b953ac8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/azure-ts-cosmosapp-component/functionApp.ts b/azure-ts-cosmosapp-component/functionApp.ts
@@ -59,21 +59,3 @@ export const functions = new CosmosApp("functions", {
  containerName: "products",
  factory: buildFunctionApp,
 });
-
-export function buildProductApp({ resourceGroup, cosmosAccount, opts }: GlobalContext) {
- return ({ location }: RegionalContext) => {
- const app = new azure.appservice.ArchiveFunctionApp("function-app", {
- resourceGroupName: resourceGroup.name,
- archive: new pulumi.asset.FileArchive("./app"),
- appSettings: {
- COSMOSDB_ENDPOINT: cosmosAccount.endpoint,
- COSMOSDB_KEY: cosmosAccount.primaryMasterKey,
- COSMOSDB_LOCATION: location,
- },
- }, opts);
-
- return {
- id: app.functionApp.id,
- };
- };
-}
diff --git a/azure-ts-cosmosapp-component/vms.ts b/azure-ts-cosmosapp-component/vms.ts
@@ -19,16 +19,18 @@ function buildVMScaleSetApp({ cosmosAccount, database, container, opts }: Global
  const file = readFileSync("./vm/vmCustomData.yaml").toString();
 
  return ({ location }: RegionalContext) => {
- const domainName = new random.RandomString(`pipdns${location}`, { length: 10, special: false, upper: false }).result;
+ const domainName = new random.RandomString(`pipdns${location}`, { length: 10, special: false, upper: false, number: false }).result;
 
  const publicIp = new azure.network.PublicIp(`pip-${location}`, {
  resourceGroupName: resourceGroup.name,
+ location,
  allocationMethod: "Static",
  domainNameLabel: domainName,
  }, opts);
 
  const loadBalancer = new azure.lb.LoadBalancer(`lb-${location}`, {
  resourceGroupName: resourceGroup.name,
+ location,
  frontendIpConfigurations: [{
  name: "PublicIPAddress",
  publicIpAddressId: publicIp.id,
@@ -59,6 +61,7 @@ function buildVMScaleSetApp({ cosmosAccount, database, container, opts }: Global
 
  const vnet = new azure.network.VirtualNetwork(`vnet-${location}`, {
  resourceGroupName: resourceGroup.name,
+ location,
  addressSpaces: ["10.0.0.0/16"],
  }, opts);
 
@@ -80,6 +83,7 @@ function buildVMScaleSetApp({ cosmosAccount, database, container, opts }: Global
 
  const scaleSet = new azure.compute.ScaleSet(`vmss-${location}`, {
  resourceGroupName: resourceGroup.name,
+ location,
  networkProfiles: [{
  ipConfigurations: [{
  loadBalancerBackendAddressPoolIds: [bpepool.id],