Reference packages consistently in examples (pulumi#224)

aws-js-containers/index.js

@@ -1,4 +1,4 @@
-const awsx = require("@pulumi/aws-infra");
+const awsx = require("@pulumi/awsx");
 
 let cluster = new awsx.ecs.Cluster("example", { });
 let listener= new awsx.elasticloadbalancingv2.NetworkListener("nginx", { port: 80 });

aws-js-containers/package.json

@@ -2,8 +2,8 @@
  "name": "container-quickstart",
  "main": "index.js",
  "dependencies": {
- "@pulumi/pulumi": "dev",
- "@pulumi/aws": "dev",
- "@pulumi/aws-infra": "dev"
+ "@pulumi/pulumi": "latest",
+ "@pulumi/aws": "latest",
+ "@pulumi/aws-infra": "latest"
  }
 }

aws-ts-airflow/index.ts

@@ -1,6 +1,6 @@
 import * as pulumi from "@pulumi/pulumi";
 import * as aws from "@pulumi/aws";
-import * as awsx from "@pulumi/aws-infra";
+import * as awsx from "@pulumi/awsx";
 
 let config = new pulumi.Config("airflow");
 const dbPassword = config.require("dbPassword");
@@ -75,15 +75,15 @@ let airflowController = new awsx.ecs.EC2Service("airflowcontroller", {
  taskDefinitionArgs: {
  containers: {
  "webserver": {
- image: awsx.ecs.Image.fromPath("./airflow-container"),
+ image: awsx.ecs.Image.fromPath("webserver", "./airflow-container"),
  portMappings: [airflowControllerListener],
  environment: environment,
  command: [ "webserver" ],
  memory: 128,
  },
 
  "scheduler": {
- image: awsx.ecs.Image.fromPath("./airflow-container"),
+ image: awsx.ecs.Image.fromPath("scheduler", "./airflow-container"),
  environment: environment,
  command: [ "scheduler" ],
  memory: 128,
@@ -105,7 +105,7 @@ let airflower = new awsx.ecs.EC2Service("airflower", {
  // If the container is named "flower", we create environment variables that start
  // with `FLOWER_` and Flower tries and fails to parse them as configuration.
  "notflower": {
- image: awsx.ecs.Image.fromPath("./airflow-container"),
+ image: awsx.ecs.Image.fromPath("notflower", "./airflow-container"),
  portMappings: [airflowerListener],
  environment: environment,
  command: [ "flower" ],
@@ -121,7 +121,7 @@ let airflowWorkers = new awsx.ecs.EC2Service("airflowworkers", {
  taskDefinitionArgs: {
  containers: {
  "worker": {
- image: awsx.ecs.Image.fromPath("./airflow-container"),
+ image: awsx.ecs.Image.fromPath("worker", "./airflow-container"),
  environment: environment,
  command: [ "worker" ],
  memory: 1024,

aws-ts-airflow/package.json

@@ -4,8 +4,8 @@
  "@types/node": "^10.1.2"
  },
  "dependencies": {
- "@pulumi/pulumi": "^0.16.9",
- "@pulumi/aws": "^0.16.5",
- "@pulumi/aws-infra": "dev"
+ "@pulumi/pulumi": "latest",
+ "@pulumi/aws": "latest",
+ "@pulumi/aws-infra": "latest"
  }
 }

aws-ts-containers/index.ts

@@ -1,4 +1,4 @@
-import * as awsx from "@pulumi/aws-infra";
+import * as awsx from "@pulumi/awsx";
 
 // Create an elastic network listener to listen for requests and route them to the container.
 // See https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html
@@ -12,7 +12,7 @@ let service = new awsx.ecs.FargateService("nginx", {
  taskDefinitionArgs: {
  containers: {
  nginx: {
- image: awsx.ecs.Image.fromPath("./app"),
+ image: awsx.ecs.Image.fromPath("nginx", "./app"),
  memory: 512,
  portMappings: [listener],
  },

aws-ts-containers/package.json

@@ -2,8 +2,8 @@
  "name": "container-quickstart",
  "main": "index.js",
  "dependencies": {
- "@pulumi/pulumi": "dev",
- "@pulumi/aws": "dev",
- "@pulumi/aws-infra": "=0.16.3-dev.1546999531"
+ "@pulumi/pulumi": "latest",
+ "@pulumi/aws": "latest",
+ "@pulumi/aws-infra": "latest"
  }
 }

aws-ts-eks-hello-world/index.ts

@@ -1,12 +1,12 @@
-import * as awsinfra from "@pulumi/aws-infra";
+import * as awsx from "@pulumi/awsx";
 import * as eks from "@pulumi/eks";
 import * as k8s from "@pulumi/kubernetes";
 import * as pulumi from "@pulumi/pulumi";
 
 const name = "helloworld";
 
 // Create an EKS cluster with non-default configuration
-const vpc = new awsinfra.Network("vpc", { usePrivateSubnets: false });
+const vpc = new awsx.Network("vpc", { usePrivateSubnets: false });
 const cluster = new eks.Cluster(name, {
  vpcId: vpc.vpcId,
  subnetIds: vpc.subnetIds,

aws-ts-eks/README.md

@@ -58,7 +58,7 @@ After cloning this repo, from this working directory, run these commands:
  status code: 400, request id: 9f031e89-a0b0-11e8-96f8-534c1d26a353
  ```
 
- We are tracking enabling the creation of VPCs limited to specific AZs to unblock this in `us-east-1`: pulumi/pulumi-aws-infra#32
+ We are tracking enabling the creation of VPCs limited to specific AZs to unblock this in `us-east-1`: pulumi/pulumi-awsx#32
 
 4. Stand up the EKS cluster, which will also deploy the Kubernetes Dashboard:
 

aws-ts-eks/index.ts

@@ -1,8 +1,8 @@
-import * as awsinfra from "@pulumi/aws-infra";
+import * as awsx from "@pulumi/awsx";
 import * as eks from "@pulumi/eks";
 
 // Create a VPC for our cluster.
-const vpc = new awsinfra.Network("vpc");
+const vpc = new awsx.Network("vpc");
 
 // Create the EKS cluster itself, including a "gp2"-backed StorageClass and a dpeloyment of the Kubernetes dashboard.
 const cluster = new eks.Cluster("cluster", {

aws-ts-serverless-raw/package.json

@@ -2,7 +2,7 @@
  "name": "serverless-raw",
  "version": "0.1.0",
  "dependencies": {
- "@pulumi/aws": "^0.16.4",
- "@pulumi/pulumi": "^0.16.8"
+ "@pulumi/aws": "latest",
+ "@pulumi/pulumi": "latest"
  }
 }

aws-ts-stepfunctions/package.json

@@ -4,7 +4,7 @@
  "@types/node": "latest"
  },
  "dependencies": {
- "@pulumi/aws": "^0.16.4",
- "@pulumi/pulumi": "^0.16.8"
+ "@pulumi/aws": "latest",
+ "@pulumi/pulumi": "latest"
  }
 }

aws-ts-thumbnailer/index.ts

@@ -1,7 +1,7 @@
 // Copyright 2016-2018, Pulumi Corporation. All rights reserved.
 
 import * as aws from "@pulumi/aws";
-import * as awsx from "@pulumi/aws-infra";
+import * as awsx from "@pulumi/awsx";
 
 // A simple cluster to run our tasks in.
 const cluster = awsx.ecs.Cluster.getDefault();
@@ -15,7 +15,7 @@ export const bucketName = bucket.id;
 // A task which runs a containerized FFMPEG job to extract a thumbnail image.
 const ffmpegThumbnailTask = new awsx.ecs.FargateTaskDefinition("ffmpegThumbTask", {
  container: {
- image: awsx.ecs.Image.fromPath("./docker-ffmpeg-thumb"),
+ image: awsx.ecs.Image.fromPath("ffmpegThumbTask", "./docker-ffmpeg-thumb"),
  memoryReservation: 512,
  },
 });

aws-ts-thumbnailer/package.json

@@ -3,8 +3,8 @@
  "version": "0.1.0",
  "main": "index.js",
  "dependencies": {
- "@pulumi/pulumi": "^0.16.9",
- "@pulumi/aws": "^0.16.5",
- "@pulumi/aws-infra": "dev"
+ "@pulumi/pulumi": "latest",
+ "@pulumi/aws": "latest",
+ "@pulumi/aws-infra": "latest"
  }
 }

aws-ts-url-shortener-cache-http/cache.ts

@@ -2,7 +2,7 @@
 
 import * as pulumi from "@pulumi/pulumi";
 import * as aws from "@pulumi/aws";
-import * as awsx from "@pulumi/aws-infra";
+import * as awsx from "@pulumi/awsx";
 import * as config from "./config";
 
 // A simple cache abstraction that wraps Redis.

aws-ts-url-shortener-cache-http/index.ts

@@ -1,7 +1,7 @@
 // Copyright 2016-2018, Pulumi Corporation. All rights reserved.
 
 import * as aws from "@pulumi/aws";
-import * as awsx from "@pulumi/aws-infra";
+import * as awsx from "@pulumi/awsx";
 import * as cloud from "@pulumi/cloud-aws";
 import * as cache from "./cache";
 import * as express from "express";

aws-ts-url-shortener-cache-http/package.json

@@ -15,10 +15,10 @@
  "@types/mime-types": "^2.1.0"
  },
  "dependencies": {
- "@pulumi/pulumi": "^0.16.9",
- "@pulumi/aws": "^0.16.5",
- "@pulumi/aws-infra": "dev",
- "@pulumi/cloud-aws": "^0.16.2",
+ "@pulumi/pulumi": "latest",
+ "@pulumi/aws": "latest",
+ "@pulumi/aws-infra": "latest",
+ "@pulumi/cloud-aws": "latest",
  "redis": "^2.8.0",
  "express": "^4.16.3",
  "parseurl": "^1.3.2",

aws-ts-voting-app/index.ts

@@ -1,7 +1,7 @@
 // Copyright 2017, Pulumi Corporation. All rights reserved.
 
 import * as pulumi from "@pulumi/pulumi";
-import * as awsx from "@pulumi/aws-infra";
+import * as awsx from "@pulumi/awsx";
 
 // Get the password to use for Redis from config.
 let config = new pulumi.Config();
@@ -34,7 +34,7 @@ let frontend = new awsx.ecs.FargateService("voting-app-frontend", {
  taskDefinitionArgs: {
  containers: {
  votingAppFrontend: {
- image: awsx.ecs.Image.fromPath("./frontend"), // path to the folder containing the Dockerfile
+ image: awsx.ecs.Image.fromPath("voting-app-frontend", "./frontend"), // path to the folder containing the Dockerfile
  memory: 512,
  portMappings: [frontendListener],
  environment: redisEndpoint.apply(e => [

aws-ts-voting-app/package.json

@@ -5,9 +5,9 @@
  "@types/node": "^8.0.27"
  },
  "dependencies": {
- "@pulumi/pulumi": "dev",
- "@pulumi/aws": "dev",
- "@pulumi/aws-infra": "dev",
- "@pulumi/cloud-aws": "dev"
+ "@pulumi/pulumi": "latest",
+ "@pulumi/aws": "latest",
+ "@pulumi/aws-infra": "latest",
+ "@pulumi/cloud-aws": "latest"
  }
 }

cloud-js-thumbnailer-machine-learning/README.md

@@ -48,8 +48,8 @@ with `***`.
  Type Name Status Info
  * global global unchanged 1 info message. info: Building container image 'p
  + pulumi:pulumi:Stack video-thumbnailer-rekognition created 1 info message. info: 88888b9b1b5b: Pushed
- + ├─ aws-infra:network:Network default-vpc created
- + ├─ aws-infra:network:Network default-vpc created
+ + ├─ awsx:network:Network default-vpc created
+ + ├─ awsx:network:Network default-vpc created
  + ├─ cloud:global:infrastructure global-infrastructure created
  + ├─ cloud:global:infrastructure global-infrastructure created
  + │ ├─ aws:iam:Role pulumi-donna-t-execution created
@@ -85,7 +85,7 @@ with `***`.
  + ├─ cloud:task:Task ffmpegThumbTask created
  + │ ├─ aws:cloudwatch:LogGroup ffmpegThumbTask created
  + │ └─ aws:ecs:TaskDefinition ffmpegThumbTask created
- + ├─ aws-infra:cluster:Cluster pulumi-donna-thum-global created
+ + ├─ awsx:cluster:Cluster pulumi-donna-thum-global created
  + │ ├─ aws:ecs:Cluster pulumi-donna-thum-global created
  + │ └─ aws:ec2:SecurityGroup pulumi-donna-thum-global created
  + ├─ aws:iam:RolePolicyAttachment rekognition-access created

cloud-js-thumbnailer-machine-learning/package.json

@@ -3,8 +3,8 @@
  "version": "0.1.0",
  "main": "index.js",
  "dependencies": {
- "@pulumi/cloud-aws": "^0.16.2",
- "@pulumi/aws": "^0.16.4",
+ "@pulumi/cloud-aws": "latest",
+ "@pulumi/aws": "latest",
  "aws-sdk": "^2.238.1"
  }
 }

cloud-js-thumbnailer/README.md

@@ -68,7 +68,7 @@ with `***`.
  + │ ├─ aws:lambda:Permission onNewThumbnail created
  + │ ├─ aws:lambda:Permission onNewVideo created
  + │ └─ aws:s3:BucketNotification bucket created
- + ├─ aws-infra:network:Network default-vpc created
+ + ├─ awsx:network:Network default-vpc created
  + ├─ aws:ecr:Repository pulum-dc8d99de-container created
  + ├─ cloud:global:infrastructure global-infrastructure created
  + │ ├─ aws:iam:Role pulumi-thumbnailer--task created
@@ -79,7 +79,7 @@ with `***`.
  + ├─ cloud:task:Task ffmpegThumbTask created
  + │ ├─ aws:cloudwatch:LogGroup ffmpegThumbTask created
  + │ └─ aws:ecs:TaskDefinition ffmpegThumbTask created
- + └─ aws-infra:cluster:Cluster pulumi-thumbnaile-global created
+ + └─ awsx:cluster:Cluster pulumi-thumbnaile-global created
  + ├─ aws:ecs:Cluster pulumi-thumbnaile-global created
  + └─ aws:ec2:SecurityGroup pulumi-thumbnaile-global created
  ...

cloud-js-thumbnailer/package.json

@@ -3,6 +3,6 @@
  "version": "0.1.0",
  "main": "index.js",
  "dependencies": {
- "@pulumi/cloud-aws": "^0.16.2"
+ "@pulumi/cloud-aws": "latest"
  }
 }

cloud-js-twitter-athena/package.json

@@ -2,9 +2,9 @@
  "name": "aws-serverless-js-twitter",
  "main": "index.js",
  "dependencies": {
- "@pulumi/cloud": "^0.16.2",
- "@pulumi/cloud-aws": "^0.16.2",
- "@pulumi/pulumi": "^0.16.8",
+ "@pulumi/cloud": "latest",
+ "@pulumi/cloud-aws": "latest",
+ "@pulumi/pulumi": "latest",
  "twitter": "^1.7.1"
  }
 }

cloud-ts-url-shortener/package.json

@@ -5,7 +5,7 @@
  "@types/node": "^8.0.27"
  },
  "dependencies": {
- "@pulumi/cloud-aws": "^0.16.2",
- "@pulumi/cloud": "^0.16.2"
+ "@pulumi/cloud-aws": "latest",
+ "@pulumi/cloud": "latest"
  }
 }

cloud-ts-voting-app/package.json

@@ -5,8 +5,8 @@
  "@types/node": "^8.0.27"
  },
  "dependencies": {
- "@pulumi/pulumi": "^0.16.8",
- "@pulumi/cloud": "^0.16.2",
- "@pulumi/cloud-aws": "^0.16.2"
+ "@pulumi/pulumi": "latest",
+ "@pulumi/cloud": "latest",
+ "@pulumi/cloud-aws": "latest"
  }
 }

gcp-ts-functions/package.json

@@ -6,7 +6,7 @@
  "@types/express": "^4.16.0"
  },
  "dependencies": {
- "@pulumi/gcp": "^0.16.2",
- "@pulumi/pulumi": "^0.16.8"
+ "@pulumi/gcp": "latest",
+ "@pulumi/pulumi": "latest"
  }
 }

gcp-ts-k8s-ruby-on-rails-postgresql/infra/package.json

@@ -4,9 +4,9 @@
  "@types/node": "latest"
  },
  "dependencies": {
- "@pulumi/docker": "^0.16.2",
+ "@pulumi/docker": "latest",
  "@pulumi/gcp": "latest",
- "@pulumi/kubernetes": "^0.17.1",
+ "@pulumi/kubernetes": "latest",
  "@pulumi/pulumi": "latest"
  }
 }

kubernetes-ts-configmap-rollout/package.json

@@ -4,7 +4,7 @@
  "@types/node": "latest"
  },
  "dependencies": {
- "@pulumi/pulumi": "^0.16.8",
- "@pulumi/kubernetes": "^0.18.0"
+ "@pulumi/pulumi": "latest",
+ "@pulumi/kubernetes": "latest"
  }
 }

kubernetes-ts-guestbook/components/package.json

@@ -5,8 +5,8 @@
  "@types/node": "^9.3.0"
  },
  "dependencies": {
- "@pulumi/kubernetes": "^0.18.0",
- "@pulumi/pulumi": "^0.16.8"
+ "@pulumi/kubernetes": "latest",
+ "@pulumi/pulumi": "latest"
  },
  "license": "MIT"
 }

kubernetes-ts-guestbook/simple/package.json

@@ -5,8 +5,8 @@
  "@types/node": "^9.3.0"
  },
  "dependencies": {
- "@pulumi/kubernetes": "^0.18.0",
- "@pulumi/pulumi": "^0.16.8"
+ "@pulumi/kubernetes": "latest",
+ "@pulumi/pulumi": "latest"
  },
  "license": "MIT"
 }