Use the new 0.17 api (#239)

CyrusNajmabadi · web-flow · commit 735a7116f0dc · 2019-03-06T15:26:23.000-08:00
diff --git a/aws-js-containers/index.js b/aws-js-containers/index.js
@@ -1,3 +1,4 @@
+const pulumi = require("@pulumi/pulumi");
 const awsx = require("@pulumi/awsx");
 
 let cluster = new awsx.ecs.Cluster("example", { });
@@ -17,4 +18,4 @@ let service = new awsx.ecs.FargateService("nginx", {
 });
 
 // export just the hostname property of the container frontend
-exports.hostname = listener.endpoint.apply(e => `http://${e.hostname}`);
+exports.hostname = pulumi.interpolate `http://${listener.endpoint.hostname}`;
diff --git a/aws-js-webserver-component/index.js b/aws-js-webserver-component/index.js
@@ -1,6 +1,8 @@
+const pulumi = require("@pulumi/pulumi");
+
 const webserver = require("./webserver.js");
 
 let webInstance = webserver.createInstance("web-server-www", "t2.nano");
 let appInstance = webserver.createInstance("web-server-app", "t2.micro");
 
-exports.webUrl = webInstance.publicDns.apply(dns => `http://${dns}`); // apply transformation to output property
+exports.webUrl = pulumi.interpolate `http://${webInstance.publicDns}`;
diff --git a/aws-ts-airflow/index.ts b/aws-ts-airflow/index.ts
@@ -55,7 +55,7 @@ let cacheCluster = new aws.elasticache.Cluster("cachecluster", {
     securityGroupIds: securityGroupIds,
 });
 
-let hosts = pulumi.all([db.endpoint.apply(e => e.split(":")[0]), cacheCluster.cacheNodes.apply(n => n[0].address)]);
+let hosts = pulumi.all([db.endpoint.apply(e => e.split(":")[0]), cacheCluster.cacheNodes[0].address]);
 let environment = hosts.apply(([postgresHost, redisHost]) => [
     { name: "POSTGRES_HOST", value: postgresHost },
     { name: "POSTGRES_PASSWORD", value: dbPassword },
@@ -130,5 +130,5 @@ let airflowWorkers = new awsx.ecs.EC2Service("airflowworkers", {
     },
 });
 
-export let airflowEndpoint = airflowControllerListener.endpoint().apply(e => e.hostname);
-export let flowerEndpoint = airflowerListener.endpoint().apply(e => e.hostname);
+export let airflowEndpoint = airflowControllerListener.endpoint().hostname;
+export let flowerEndpoint = airflowerListener.endpoint().hostname;
diff --git a/aws-ts-containers/index.ts b/aws-ts-containers/index.ts
@@ -1,3 +1,4 @@
+import * as pulumi from "@pulumi/pulumi";
 import * as awsx from "@pulumi/awsx";
 
 // Create an elastic network listener to listen for requests and route them to the container.
@@ -21,4 +22,4 @@ let service = new awsx.ecs.FargateService("nginx", {
 });
 
 // export just the hostname property of the container frontend
-export const hostname = listener.endpoint().apply(e => `http://${e.hostname}`);
+export const hostname = pulumi.interpolate `http://${listener.endpoint.hostname}`;
diff --git a/aws-ts-eks-hello-world/index.ts b/aws-ts-eks-hello-world/index.ts
@@ -25,7 +25,7 @@ export const kubeconfig = cluster.kubeconfig
 const ns = new k8s.core.v1.Namespace(name, {}, { provider: cluster.provider });
 
 // Export the Namespace name
-export const namespaceName = ns.metadata.apply(m => m.name);
+export const namespaceName = ns.metadata.name;
 
 // Create a NGINX Deployment
 const appLabels = { appClass: name };
@@ -60,7 +60,7 @@ const deployment = new k8s.apps.v1.Deployment(name,
 );
 
 // Export the Deployment name
-export const deploymentName = deployment.metadata.apply(m => m.name);
+export const deploymentName = deployment.metadata.name;
 
 // Create a LoadBalancer Service for the NGINX Deployment
 const service = new k8s.core.v1.Service(name,
@@ -81,5 +81,5 @@ const service = new k8s.core.v1.Service(name,
 );
 
 // Export the Service name and public LoadBalancer Endpoint
-export const serviceName = service.metadata.apply(m => m.name);
+export const serviceName = service.metadata.name;
 export const serviceHostname = service.status.apply(s => s.loadBalancer.ingress[0].hostname)
diff --git a/aws-ts-resources/index.ts b/aws-ts-resources/index.ts
@@ -10,7 +10,7 @@ const database = new aws.athena.Database("mydatabase", {
 
 const namedQuery = new aws.athena.NamedQuery("mynamedquery", {
     database: database.id,
-    query: database.id.apply(n => `SELECT * FROM ${n} limit 10;`)
+    query: pulumi.interpolate `SELECT * FROM ${database.id} limit 10;`,
 });
 
 // CloudWatch
diff --git a/aws-ts-ruby-on-rails/index.ts b/aws-ts-ruby-on-rails/index.ts
@@ -1,3 +1,4 @@
+import * as pulumi from "@pulumi/pulumi";
 import * as aws from "@pulumi/aws";
 import * as config from "./config";
 import { getLinuxAmi } from "pawsami";
@@ -50,7 +51,7 @@ const webServer = new aws.ec2.Instance("webServer", {
                     },
                 },
                 services: {
-                    "sysvinit": {  
+                    "sysvinit": {
                         "mysqld": { enabled: true, ensureRunning: true },
                     },
                 },
@@ -114,4 +115,4 @@ const webServer = new aws.ec2.Instance("webServer", {
 export let vmIP = webServer.publicIp;
 
 // Export the URL for our newly created Rails application.
-export let websiteURL = webServer.publicDns.apply(url => `http://${url}/notes`);
+export let websiteURL = pulumi.interpolate `http://${webServer.publicDns}/notes`;
diff --git a/aws-ts-serverless-raw/index.ts b/aws-ts-serverless-raw/index.ts
@@ -1,9 +1,9 @@
 // Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
 
-import * as aws from "@pulumi/aws";
 import * as pulumi from "@pulumi/pulumi";
+import * as aws from "@pulumi/aws";
 
-// The location of the built dotnet2.0 application to deploy 
+// The location of the built dotnet2.0 application to deploy
 let dotNetApplicationPublishFolder = "./app/bin/Debug/netcoreapp2.0/publish";
 let dotNetApplicationEntryPoint = "app::app.Functions::GetAsync";
 // The stage name to use for the API Gateway URL
@@ -58,7 +58,7 @@ let lambda = new aws.lambda.Function("mylambda", {
     timeout: 300,
     handler: dotNetApplicationEntryPoint,
     role: role.arn,
-    environment: { 
+    environment: {
         variables: {
             "COUNTER_TABLE": counterTable.name
         }
@@ -105,11 +105,11 @@ let restApi = new aws.apigateway.RestApi("api", {
 let deployment = new aws.apigateway.Deployment("api-deployment", {
     restApi: restApi,
     // Note: Set to empty to avoid creating an implicit stage, we'll create it explicitly below instead.
-    stageName: "", 
+    stageName: "",
 });
 
 // Create a stage, which is an addressable instance of the Rest API. Set it to point at the latest deployment.
-let stage = new aws.apigateway.Stage("api-stage", { 
+let stage = new aws.apigateway.Stage("api-stage", {
     restApi: restApi,
     deployment: deployment,
     stageName: stageName
@@ -120,8 +120,8 @@ let invokePermission = new aws.lambda.Permission("api-lambda-permission", {
     action: "lambda:invokeFunction",
     function: lambda,
     principal: "apigateway.amazonaws.com",
-    sourceArn: deployment.executionArn.apply(arn => arn + "*/*"),
+    sourceArn: pulumi.interpolate `${deployment.executionArn}*/*`,
 });
 
 // Export the https endpoint of the running Rest API
-export let endpoint = deployment.invokeUrl.apply(url => url + stageName);
+export let endpoint = pulumi.interpolate `${deployment.invokeUrl}${stageName}`;
diff --git a/aws-ts-static-website/index.ts b/aws-ts-static-website/index.ts
@@ -1,5 +1,5 @@
-import * as aws from "@pulumi/aws";
 import * as pulumi from "@pulumi/pulumi";
+import * as aws from "@pulumi/aws";
 
 import * as fs from "fs";
 import * as mime from "mime";
@@ -84,7 +84,7 @@ let certificateArn: pulumi.Input<string> = config.certificateArn!;
  * Only provision a certificate (and related resources) if a certificateArn is _not_ provided via configuration.
  */
 if (config.certificateArn === undefined) {
-    
+
     const eastRegion = new aws.Provider("east", {
         region: "us-east-1", // Per AWS, ACM certificate must be in the us-east-1 region.
     });
@@ -102,18 +102,18 @@ if (config.certificateArn === undefined) {
      *  See https://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate-dns.html for more info.
      */
     const certificateValidationDomain = new aws.route53.Record(`${config.targetDomain}-validation`, {
-        name: certificate.domainValidationOptions.apply(d => d[0].resourceRecordName),
+        name: certificate.domainValidationOptions[0].resourceRecordName,
         zoneId: hostedZoneId,
-        type: certificate.domainValidationOptions.apply(d => d[0].resourceRecordType),
-        records: [certificate.domainValidationOptions.apply(d => d[0].resourceRecordValue)],
+        type: certificate.domainValidationOptions[0].resourceRecordType,
+        records: [certificate.domainValidationOptions[0].resourceRecordValue],
         ttl: tenMinutes,
     });
 
     /**
-     * This is a _special_ resource that waits for ACM to complete validation via the DNS record 
-     * checking for a status of "ISSUED" on the certificate itself. No actual resources are 
-     * created (or updated or deleted). 
-     * 
+     * This is a _special_ resource that waits for ACM to complete validation via the DNS record
+     * checking for a status of "ISSUED" on the certificate itself. No actual resources are
+     * created (or updated or deleted).
+     *
      * See https://www.terraform.io/docs/providers/aws/r/acm_certificate_validation.html for slightly more detail
      * and https://github.com/terraform-providers/terraform-provider-aws/blob/master/aws/resource_aws_acm_certificate_validation.go
      * for the actual implementation.
@@ -132,7 +132,7 @@ if (config.certificateArn === undefined) {
 const distributionArgs: aws.cloudfront.DistributionArgs = {
     enabled: true,
     // Alternate aliases the CloudFront distribution can be reached at, in addition to https://xxxx.cloudfront.net.
-    // Required if you want to access the distribution via config.targetDomain as well.  
+    // Required if you want to access the distribution via config.targetDomain as well.
     aliases: [ config.targetDomain ],
 
     // We only specify one origin for this distribution, the S3 content bucket.
@@ -248,7 +248,7 @@ const aRecord = createAliasRecord(config.targetDomain, cdn);
 
 // Export properties from this stack. This prints them at the end of `pulumi up` and
 // makes them easier to access from the pulumi.com.
-export const contentBucketUri = contentBucket.bucket.apply(b => `s3://${b}`);
+export const contentBucketUri = pulumi.interpolate `s3://${contentBucket.bucket}`;
 export const contentBucketWebsiteEndpoint = contentBucket.websiteEndpoint;
 export const cloudFrontDomain = cdn.domainName;
 export const targetDomainEndpoint = `https://${config.targetDomain}/`;
diff --git a/aws-ts-url-shortener-cache-http/index.ts b/aws-ts-url-shortener-cache-http/index.ts
@@ -1,5 +1,6 @@
 // Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
 
+import * as pulumi from "@pulumi/pulumi";
 import * as aws from "@pulumi/aws";
 import * as awsx from "@pulumi/awsx";
 import * as cloud from "@pulumi/cloud-aws";
@@ -104,4 +105,4 @@ let httpServer = new cloud.HttpServer("urlshortener", () => {
     return app;
 });
 
-export let endpointUrl = httpServer.url.apply(u => u + "index.html");
+export let endpointUrl = pulumi.interpolate `${httpServer.url}index.html`;
diff --git a/azure-ts-appservice/index.ts b/azure-ts-appservice/index.ts
@@ -63,14 +63,14 @@ const username = "pulumi";
 
 // Get the password to use for SQL from config.
 const config = new pulumi.Config();
-const pwd = config.require("sqlPassword"); 
+const pwd = config.require("sqlPassword");
 
 const sqlServer = new azure.sql.SqlServer(`${prefix}-sql`, {
     ...resourceGroupArgs,
 
     administratorLogin: username,
     administratorLoginPassword: pwd,
-    version: "12.0", 
+    version: "12.0",
 });
 
 const database = new azure.sql.Database(`${prefix}-db`, {
@@ -93,11 +93,11 @@ const app = new azure.appservice.AppService(`${prefix}-as`, {
 
     connectionStrings: [{
         name: "db",
-        value: 
-            pulumi.all([sqlServer.name, database.name]).apply(([server, db]) => 
+        value:
+            pulumi.all([sqlServer.name, database.name]).apply(([server, db]) =>
                 `Server=tcp:${server}.database.windows.net;initial catalog=${db};user ID=${username};password=${pwd};Min Pool Size=0;Max Pool Size=30;Persist Security Info=true;`),
         type: "SQLAzure"
-    }]    
+    }]
 });
 
-exports.endpoint = app.defaultSiteHostname.apply(n => `https://${n}`);
+exports.endpoint = pulumi.interpolate `https://${app.defaultSiteHostname}`;
diff --git a/azure-ts-arm-template/index.ts b/azure-ts-arm-template/index.ts
@@ -71,4 +71,4 @@ const armDeployment = new azure.core.TemplateDeployment("test-dep", {
 });
 
 // Finally, export the allocated storage account name.
-export const storageAccountName = armDeployment.outputs.apply(outs => outs["storageAccountName"]);
+export const storageAccountName = armDeployment.outputs["storageAccountName"];
diff --git a/cloud-js-containers/index.js b/cloud-js-containers/index.js
@@ -1,3 +1,4 @@
+const pulumi = require("@pulumi/pulumi");
 const cloud = require("@pulumi/cloud-aws");
 
 let service = new cloud.Service("pulumi-nginx", {
@@ -12,4 +13,4 @@ let service = new cloud.Service("pulumi-nginx", {
 });
 
 // export just the hostname property of the container frontend
-exports.hostname = service.defaultEndpoint.apply(e => `http://${e.hostname}`);
+exports.hostname = pulumi.interpolate `http://${service.defaultEndpoint.hostname}`;
diff --git a/cloud-ts-url-shortener-cache-http/cache.ts b/cloud-ts-url-shortener-cache-http/cache.ts
@@ -22,7 +22,7 @@ export class Cache {
             },
         });
 
-        this.endpoint = this.redis.endpoints.apply(endpoints => endpoints.redis[6379]);
+        this.endpoint = this.redis.endpoints.redis[6379];
     }
 
     public get(key: string): Promise<string> {
diff --git a/cloud-ts-url-shortener-cache-http/index.ts b/cloud-ts-url-shortener-cache-http/index.ts
@@ -1,5 +1,6 @@
 // Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
 
+import * as pulumi from "@pulumi/pulumi";
 import * as cloud from "@pulumi/cloud";
 import * as cache from "./cache";
 import * as express from "express";
@@ -131,4 +132,4 @@ function staticRoutes(app: express.Express, path: string, root: string) {
     }
 }
 
-export let endpointUrl = endpoint.url.apply(u => u + "index.html");
+export let endpointUrl = pulumi.interpolate `${endpoint.url}index.html`;
diff --git a/cloud-ts-url-shortener-cache/cache.ts b/cloud-ts-url-shortener-cache/cache.ts
@@ -23,7 +23,7 @@ export class Cache {
             },
         });
 
-        let endpoint = this.redis.endpoints.apply(endpoints => endpoints.redis[6379]);
+        let endpoint = this.redis.endpoints.redis[6379];
         this.get = async (key: string) => {
             let ep = (await endpoint).get();
             console.log(`Getting key '${key}' on Redis@${ep.hostname}:${ep.port}`);
diff --git a/cloud-ts-voting-app/index.ts b/cloud-ts-voting-app/index.ts
@@ -5,7 +5,7 @@ import * as cloud from "@pulumi/cloud";
 
 // Get the password to use for Redis from config.
 let config = new pulumi.Config();
-let redisPassword = config.require("redisPassword"); 
+let redisPassword = config.require("redisPassword");
 let redisPort = 6379;
 
 // The data layer for the application
@@ -21,7 +21,7 @@ let redisCache = new cloud.Service("voting-app-cache", {
     },
 });
 
-let redisEndpoint = redisCache.endpoints.apply(endpoints => endpoints.redis[redisPort]);
+let redisEndpoint = redisCache.endpoints.redis[redisPort];
 
 // A custom container for the frontend, which is a Python Flask app
 // Use the 'build' property to specify a folder that contains a Dockerfile.
@@ -31,10 +31,10 @@ let frontend = new cloud.Service("voting-app-frontend", {
         votingAppFrontend: {
             build: "./frontend",   // path to the folder containing the Dockerfile
             memory: 512,
-            ports: [{ port: 80 }],            
-            environment: { 
+            ports: [{ port: 80 }],
+            environment: {
                 // pass the Redis container info in environment variables
-                "REDIS":      redisEndpoint.apply(e => e.hostname),
+                "REDIS":      redisEndpoint.hostname,
                 "REDIS_PORT": redisEndpoint.apply(e => e.port.toString()),
                 "REDIS_PWD":  redisPassword
             }
@@ -43,4 +43,4 @@ let frontend = new cloud.Service("voting-app-frontend", {
 });
 
 // Export a variable that will be displayed during 'pulumi up'
-export let frontendURL = frontend.endpoints.apply(e => e["votingAppFrontend"][80].hostname);
+export let frontendURL = frontend.endpoints["votingAppFrontend"][80].hostname;
diff --git a/f5bigip-ts-ltm-pool/f5bigip-ec2-instance/index.ts b/f5bigip-ts-ltm-pool/f5bigip-ec2-instance/index.ts
@@ -81,5 +81,5 @@ const f5BigIpInstance = new aws.ec2.Instance("bigIp", {
     vpcSecurityGroupIds: [firewall.id],
 });
 
-export const f5Address = f5BigIpInstance.publicIp.apply(x => `https://${x}:8443`);
+export const f5Address = pulumi.interpolate `https://${f5BigIpInstance.publicIp}:8443`;
 export const f5PrivateIp = f5BigIpInstance.privateIp;
diff --git a/gcp-js-webserver/index.js b/gcp-js-webserver/index.js
@@ -35,4 +35,4 @@ const computeInstance = new gcp.compute.Instance("instance", {
 }, { dependsOn: [computeFirewall] });
 
 exports.instanceName = computeInstance.name;
-exports.instanceIP = computeInstance.networkInterfaces.apply(ni => ni[0].accessConfigs[0].natIp);
+exports.instanceIP = computeInstance.networkInterfaces[0].accessConfigs[0].natIp;
diff --git a/gcp-ts-gke-hello-world/index.ts b/gcp-ts-gke-hello-world/index.ts
@@ -67,7 +67,7 @@ const clusterProvider = new k8s.Provider(name, {
 const ns = new k8s.core.v1.Namespace(name, {}, { provider: clusterProvider });
 
 // Export the Namespace name
-export const namespaceName = ns.metadata.apply(m => m.name);
+export const namespaceName = ns.metadata.name;
 
 // Create a NGINX Deployment
 const appLabels = { appClass: name };
@@ -102,7 +102,7 @@ const deployment = new k8s.apps.v1.Deployment(name,
 );
 
 // Export the Deployment name
-export const deploymentName = deployment.metadata.apply(m => m.name);
+export const deploymentName = deployment.metadata.name;
 
 // Create a LoadBalancer Service for the NGINX Deployment
 const service = new k8s.core.v1.Service(name,
@@ -123,5 +123,5 @@ const service = new k8s.core.v1.Service(name,
 );
 
 // Export the Service name and public LoadBalancer endpoint
-export const serviceName = service.metadata.apply(m => m.name);
+export const serviceName = service.metadata.name;
 export const servicePublicIP = service.status.apply(s => s.loadBalancer.ingress[0].ip)
diff --git a/gcp-ts-k8s-ruby-on-rails-postgresql/infra/index.ts b/gcp-ts-k8s-ruby-on-rails-postgresql/infra/index.ts
@@ -43,16 +43,16 @@ const appDeployment = new k8s.apps.v1.Deployment("rails-deployment", {
     },
 }, { provider: cluster.provider });
 const appService = new k8s.core.v1.Service("rails-service", {
-    metadata: { labels: appDeployment.metadata.apply(m => m.labels) },
+    metadata: { labels: appDeployment.metadata.labels },
     spec: {
         type: "LoadBalancer",
         ports: [{ port: appPort, targetPort: appPort }],
-        selector: appDeployment.spec.apply(spec => spec.template.metadata.labels),
+        selector: appDeployment.spec.template.metadata.labels,
     },
 }, { provider: cluster.provider });
 
 // Export the app deployment name so we can easily access it.
-export let appName = appDeployment.metadata.apply(m => m.name);
+export let appName = appDeployment.metadata.name;
 
 // Export the service's IP address.
 export let appAddress = appService.status.apply(s => `http://${s.loadBalancer.ingress[0].ip}:${appPort}`);
diff --git a/kubernetes-ts-configmap-rollout/index.ts b/kubernetes-ts-configmap-rollout/index.ts
diff --git a/kubernetes-ts-exposed-deployment/index.ts b/kubernetes-ts-exposed-deployment/index.ts
diff --git a/kubernetes-ts-guestbook/components/k8sjs.ts b/kubernetes-ts-guestbook/components/k8sjs.ts
diff --git a/kubernetes-ts-guestbook/simple/index.ts b/kubernetes-ts-guestbook/simple/index.ts
diff --git a/kubernetes-ts-nginx/index.ts b/kubernetes-ts-nginx/index.ts
diff --git a/kubernetes-ts-s3-rollout/index.ts b/kubernetes-ts-s3-rollout/index.ts
diff --git a/kubernetes-ts-s3-rollout/s3Helpers.ts b/kubernetes-ts-s3-rollout/s3Helpers.ts
diff --git a/kubernetes-ts-sock-shop/index.ts b/kubernetes-ts-sock-shop/index.ts
diff --git a/kubernetes-ts-staged-rollout-with-prometheus/index.ts b/kubernetes-ts-staged-rollout-with-prometheus/index.ts
diff --git a/twilio-ts-component/twilio.ts b/twilio-ts-component/twilio.ts

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export class Cache {`
`22`	`22`	`},`
`23`	`23`	`});`
`24`	`24`
`25`		`- this.endpoint = this.redis.endpoints.apply(endpoints => endpoints.redis[6379]);`
	`25`	`+ this.endpoint = this.redis.endpoints.redis[6379];`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public get(key: string): Promise<string> {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`// Copyright 2016-2018, Pulumi Corporation. All rights reserved.`
`2`	`2`
	`3`	`+import * as pulumi from "@pulumi/pulumi";`
`3`	`4`	`import * as cloud from "@pulumi/cloud";`
`4`	`5`	`import * as cache from "./cache";`
`5`	`6`	`import * as express from "express";`
`@@ -131,4 +132,4 @@ function staticRoutes(app: express.Express, path: string, root: string) {`
`131`	`132`	`}`
`132`	`133`	`}`
`133`	`134`
`134`		`-export let endpointUrl = endpoint.url.apply(u => u + "index.html");`
	`135`	+export let endpointUrl = pulumi.interpolate `${endpoint.url}index.html`;