Update all examples to 2.7.2 typescript and 0.11.0 packages (pulumi#31)

nuved · Mar 31, 2018 · b2c2a7d · b2c2a7d
1 parent cc46fcd
commit b2c2a7d
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 39 deletions.
diff --git a/alexa-fortune/index.ts b/alexa-fortune/index.ts
@@ -1,4 +1,6 @@
-import * as pulumi from "pulumi";
+// Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
+
+import * as pulumi from "@pulumi/pulumi";
 import * as aws from "@pulumi/aws";
 
 // First, create a config object and read the following user-provided values:

diff --git a/alexa-fortune/package.json b/alexa-fortune/package.json
@@ -9,13 +9,12 @@
     "devDependencies": {
         "@types/alexa-sdk": "^1.0.11",
         "@types/node": "^8.0.27",
-        "typescript": "^2.1.4"
+        "typescript": "^2.7.2"
     },
     "dependencies": {
-        "alexa-sdk": "^1.0.25"
-    },
-    "peerDependencies": {
-        "@pulumi/aws": "*",
-        "@pulumi/cloud": "*"
+        "alexa-sdk": "^1.0.25",
+        "@pulumi/pulumi": "^0.11.0",
+        "@pulumi/cloud":  "^0.11.0",
+        "@pulumi/cloud-aws":  "^0.11.0"
     }
 }
diff --git a/serverless-raw/package.json b/serverless-raw/package.json
@@ -7,7 +7,7 @@
         "build": "tsc"
     },
     "devDependencies": {
-        "typescript": "^2.5.3"
+        "typescript": "^2.7.2"
     },
     "dependencies": {
         "@pulumi/aws": "^0.11.0",

diff --git a/url-shortener-with-cache/Pulumi.yaml b/url-shortener-with-cache/Pulumi.yaml
@@ -1,7 +1,3 @@
 name: url-shortener
 runtime: nodejs
 description: URL shortener sample
-config:
-  url-shortener:config:redisPassword: SecretPassw0rd
-  aws:config:region: us-west-2
-  cloud-aws:config:ecsAutoCluster: true
diff --git a/url-shortener-with-cache/config.ts b/url-shortener-with-cache/config.ts
@@ -1,6 +1,6 @@
-// Copyright 2016-2017, Pulumi Corporation.  All rights reserved.
+// Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
 
-import * as pulumi from "pulumi";
+import * as pulumi from "@pulumi/pulumi";
 
 let config = new pulumi.Config("url-shortener:config");
 

diff --git a/url-shortener-with-cache/index.ts b/url-shortener-with-cache/index.ts
@@ -1,5 +1,6 @@
-// Copyright 2016-2017, Pulumi Corporation.  All rights reserved.
+// 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";
 

diff --git a/url-shortener-with-cache/package.json b/url-shortener-with-cache/package.json
@@ -8,11 +8,11 @@
     },
     "devDependencies": {
         "@types/node": "^8.0.27",
-        "typescript": "^2.1.4"
+        "typescript": "^2.7.2"
     },
     "dependencies": {
         "redis": "^2.8.0",
-        "@pulumi/cloud": "^0.10.0",
-        "@pulumi/cloud-aws": "^0.10.0"
+        "@pulumi/cloud": "^0.11.0",
+        "@pulumi/cloud-aws": "^0.11.0"
     }
 }
diff --git a/url-shortener/index.ts b/url-shortener/index.ts
@@ -1,4 +1,4 @@
-// Copyright 2016-2017, Pulumi Corporation.  All rights reserved.
+// Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
 
 import * as cloud from "@pulumi/cloud";
 import { Output } from "@pulumi/pulumi"; // for output property

diff --git a/url-shortener/package.json b/url-shortener/package.json
@@ -8,10 +8,10 @@
     },
     "devDependencies": {
         "@types/node": "^8.0.27",
-        "typescript": "^2.1.4"
+        "typescript": "^2.7.2"
     },
     "dependencies": {
-        "@pulumi/cloud": "^0.10.0",
-        "@pulumi/cloud-aws": "^0.10.0"
+        "@pulumi/cloud": "^0.11.0",
+        "@pulumi/cloud-aws": "^0.11.0"
     }
 }
diff --git a/webserver-component/Pulumi.yaml b/webserver-component/Pulumi.yaml
@@ -1,7 +1,3 @@
 name: webserver
 runtime: nodejs
 description: Basic example of an AWS web server accessible over HTTP.
-stacks:
-  testing:
-    config:
-      aws:config:region: us-west-2
diff --git a/webserver-component/package.json b/webserver-component/package.json
@@ -1,15 +1,7 @@
 {
     "name": "webserver",
     "version": "0.1.0",
-    "main": "bin/index.js",
-    "typings": "bin/index.d.ts",
-    "scripts": {
-        "build": "tsc"
-    },
-    "devDependencies": {
-        "typescript": "^2.5.3",
-        "@types/node": "^8.0.26"
-    },
+    "main": "index.js",
     "dependencies": {
         "@pulumi/pulumi": "^0.11.0",
         "@pulumi/aws": "^0.11.0"

diff --git a/webserver-zones/Pulumi.yaml b/webserver-zones/Pulumi.yaml
@@ -1,3 +1,3 @@
 name: webserver
 runtime: nodejs
-description: Basic example of an AWS web server accessible over HTTP.
+description: Basic example of an AWS web server accessible over HTTP.
diff --git a/webserver-zones/index.ts b/webserver-zones/index.ts
@@ -1,3 +1,5 @@
+// Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
+
 import * as aws from "@pulumi/aws";
 import * as webserver from "./webserver"; // use the new custom component
 import * as pulumi from "@pulumi/pulumi";
@@ -14,4 +16,3 @@ export let serverUrls = (async () => {
 
     return urls;
 })();    
-
diff --git a/webserver-zones/linuxAmi.ts b/webserver-zones/linuxAmi.ts
@@ -1,4 +1,4 @@
-// Copyright 2016-2017, Pulumi Corporation.  All rights reserved.
+// Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
 
 // This file defines some maps that correspond to the recommended AWS Marketplace values:
 //     http://docs.aws.amazon.com/servicecatalog/latest/adminguide/catalogs_marketplace-products.html

diff --git a/webserver-zones/package.json b/webserver-zones/package.json
@@ -7,7 +7,7 @@
         "build": "tsc"
     },
     "devDependencies": {
-        "typescript": "^2.5.3",
+        "typescript": "^2.7.2",
         "@types/node": "^8.0.26"
     },
     "dependencies": {

diff --git a/webserver-zones/webserver.ts b/webserver-zones/webserver.ts
@@ -1,3 +1,5 @@
+// Copyright 2016-2018, Pulumi Corporation.  All rights reserved.
+
 import * as aws from "@pulumi/aws";
 import { getLinuxAMI } from "./linuxAmi";