diff --git a/README.md b/README.md index 265da031e964..73e4801e17d2 100644 --- a/README.md +++ b/README.md @@ -47,5 +47,6 @@ Navigate to one of the `examples` and run Pulumi: ``` $ cd ./exampes/simple +$ yarn link @pulumi/azurerm $ pulumi up ``` diff --git a/examples/appservice/index.ts b/examples/appservice/index.ts index 465919bd6c1a..e348ea1fa74c 100644 --- a/examples/appservice/index.ts +++ b/examples/appservice/index.ts @@ -1,18 +1,26 @@ import * as pulumi from "@pulumi/pulumi"; -import * as azurerm from "../../sdk/nodejs"; +import * as random from "@pulumi/random"; -const resourceGroup = new azurerm.resources.latest.ResourceGroup("rg", { - resourceGroupName: "azurerm-appservice", +import * as insights from "@pulumi/azurerm/insights/latest"; +import * as resources from "@pulumi/azurerm/resources/latest"; +import * as sql from "@pulumi/azurerm/sql/latest"; +import * as storage from "@pulumi/azurerm/storage/latest"; +import * as web from "@pulumi/azurerm/web/latest"; + +const randomString = new random.RandomString("random", { + length: 12, + special: false, + upper: false, +}); + +const resourceGroup = new resources.ResourceGroup("rg", { + resourceGroupName: randomString.result, location: "westus2", - tags: { - Owner: "mikhailshilkov", - Env: "prod2", - }, }); -const storageAccount = new azurerm.storage.latest.StorageAccount("sa", { +const storageAccount = new storage.StorageAccount("sa", { resourceGroupName: resourceGroup.name, - accountName: "pulumiassa", + accountName: randomString.result, location: "westus2", sku: { name: "Standard_LRS", @@ -21,9 +29,9 @@ const storageAccount = new azurerm.storage.latest.StorageAccount("sa", { kind: "StorageV2", }); -const appServicePlan = new azurerm.web.latest.AppServicePlan("asp", { +const appServicePlan = new web.AppServicePlan("asp", { resourceGroupName: resourceGroup.name, - name: "appservice-plan", + name: randomString.result, location: "westus2", kind: "App", sku: { @@ -32,7 +40,7 @@ const appServicePlan = new azurerm.web.latest.AppServicePlan("asp", { }, }); -const storageContainer = new azurerm.storage.latest.BlobContainer("c", { +const storageContainer = new storage.BlobContainer("c", { resourceGroupName: resourceGroup.name, accountName: storageAccount.name, containerName: "files", @@ -51,10 +59,10 @@ const storageContainer = new azurerm.storage.latest.BlobContainer("c", { // TODO: invokes are not supported yet // const codeBlobUrl = azure.storage.signedBlobReadUrl(blob, storageAccount); -const appInsights = new azurerm.insights.latest.Component("ai", { +const appInsights = new insights.Component("ai", { resourceGroupName: resourceGroup.name, location: "westus2", - resourceName: "pulumi-as-ai", + resourceName: randomString.result, kind: "web", applicationType: "web", }); @@ -62,16 +70,16 @@ const appInsights = new azurerm.insights.latest.Component("ai", { const username = "pulumi"; const pwd = "Not2S3cure!?"; -const sqlServer = new azurerm.sql.latest.Server("sql", { +const sqlServer = new sql.Server("sql", { resourceGroupName: resourceGroup.name, location: "westus2", - serverName: "pulumi-as-sql", + serverName: randomString.result, administratorLogin: username, administratorLoginPassword: pwd, version: "12.0", }); -const database = new azurerm.sql.latest.Database("db", { +const database = new sql.Database("db", { resourceGroupName: resourceGroup.name, location: "westus2", serverName: sqlServer.name, @@ -79,10 +87,10 @@ const database = new azurerm.sql.latest.Database("db", { requestedServiceObjectiveName: "S0", }); -const app = new azurerm.web.latest.WebApp("as", { +const app = new web.WebApp("as", { resourceGroupName: resourceGroup.name, location: "westus2", - name: "pulumi-rm-as", + name: randomString.result, serverFarmId: appServicePlan.id, siteConfig: { diff --git a/examples/appservice/package.json b/examples/appservice/package.json index 87673191bdca..9acf8526d20e 100644 --- a/examples/appservice/package.json +++ b/examples/appservice/package.json @@ -5,9 +5,7 @@ "@types/node": "latest" }, "dependencies": { - "@pulumi/pulumi": "latest" - }, - "peerDependencies": { - "@pulumi/azurerm": "latest" + "@pulumi/pulumi": "^2.0.0", + "@pulumi/random": "^2.0.0" } } diff --git a/examples/cosmosdb/component.ts b/examples/cosmosdb/component.ts index 1b7a4652f4b7..61d63c380cb9 100644 --- a/examples/cosmosdb/component.ts +++ b/examples/cosmosdb/component.ts @@ -1,6 +1,9 @@ -import * as azurerm from "../../sdk/nodejs"; import * as pulumi from "@pulumi/pulumi"; +import * as documentdb from "@pulumi/azurerm/documentdb/latest"; +import * as resources from "@pulumi/azurerm/resources/latest"; +import { documentdb as documentdbInputs } from "@pulumi/azurerm/types/input"; + export type Location = "eastasia" | "southeastasia" | @@ -66,7 +69,7 @@ type MultipleLocations = { type Locationable = SingleLocation | MultipleLocations; interface MyDatabaseAccountArgs { - resourceGroup: azurerm.resources.latest.ResourceGroup; + resourceGroup: resources.ResourceGroup; api: Api; consisencyPolicy: ConsistencyPolicy; location: Locationable; @@ -75,10 +78,10 @@ interface MyDatabaseAccountArgs { export class DatabaseAccount { public id: pulumi.Output; - constructor(name: string, args: MyDatabaseAccountArgs) { + constructor(name: pulumi.Output, args: MyDatabaseAccountArgs) { let kind = "GlobalDocumentDB"; - let capabilities: azurerm.types.input.documentdb.latest.Capability[] = []; + let capabilities: documentdbInputs.latest.Capability[] | undefined = undefined; if (args.api === "MongoDB") { kind = "MongoDB"; } else if (args.api === "Cassandra") { @@ -93,7 +96,7 @@ export class DatabaseAccount { const enableMultipleWriteLocations = args.location.type === "single" ? false : args.location.enableMultipleWriteLocations; const enableAutomaticFailover = args.location.type === "single" ? false : args.location.enableAutomaticFailover; - const cosmosdbAccount = new azurerm.documentdb.latest.DatabaseAccount(name, { + const cosmosdbAccount = new documentdb.DatabaseAccount("dbaccount", { resourceGroupName: args.resourceGroup.name, accountName: name, location: locations[0], diff --git a/examples/cosmosdb/index.ts b/examples/cosmosdb/index.ts index 30034f2eaaee..1dd867961723 100644 --- a/examples/cosmosdb/index.ts +++ b/examples/cosmosdb/index.ts @@ -1,46 +1,24 @@ -import * as pulumi from "@pulumi/pulumi"; -import * as azurerm from "../../sdk/nodejs"; +import * as random from "@pulumi/random"; +import * as resources from "@pulumi/azurerm/resources/latest"; import * as cosmosdb from "./component"; -const resourceGroup = new azurerm.resources.latest.ResourceGroup("rg", { - resourceGroupName: "azurerm-cosmos", +const randomString = new random.RandomString("random", { + length: 12, + special: false, + upper: false, +}); + +const resourceGroup = new resources.ResourceGroup("rg", { + resourceGroupName: randomString.result, location: "westeurope", - tags: { - Owner: "mikhailshilkov", - }, }); -export const cosmosdbAccount = new cosmosdb.DatabaseAccount("pulumicosmosdb", { +export const cosmosdbAccount = new cosmosdb.DatabaseAccount(randomString.result, { resourceGroup, api: "Sql", consisencyPolicy: { defaultConsistencyLevel: "Session" }, location: { - type: "multiple", - regions: ["westeurope", "northeurope"], - enableMultipleWriteLocations: true, - enableAutomaticFailover: true, + type: "single", + region: "westeurope", }, }); - -// const cosmosdbAccount2 = new azurerm.documentdb.latest.DatabaseAccount("pulumicosmosdb", { -// resourceGroupName: resourceGroup.name, -// accountName: "pulumicosmosdb", -// location: resourceGroup.location, -// kind: "GlobalDocumentDB", -// consistencyPolicy: { -// defaultConsistencyLevel: "Session", -// }, -// locations: [{ -// locationName: "westeurope", -// failoverPriority: 0, -// isZoneRedundant: false -// }, { -// locationName: "northeurope", -// failoverPriority: 1, -// isZoneRedundant: false -// }], -// databaseAccountOfferType: "Standard", -// enableAutomaticFailover: true, -// capabilities: [], -// enableMultipleWriteLocations: true, -// }); diff --git a/examples/cosmosdb/package.json b/examples/cosmosdb/package.json index 4429d09da139..166d28bdfa85 100644 --- a/examples/cosmosdb/package.json +++ b/examples/cosmosdb/package.json @@ -5,13 +5,11 @@ "@types/node": "latest" }, "dependencies": { - "@pulumi/pulumi": "latest", + "@pulumi/pulumi": "^2.0.0", + "@pulumi/random": "^2.0.0", "@types/node": "^10.3.3", "@types/mocha": "^5.2.7", "mocha": "^7.0.0", "ts-node": "^8.6.2" - }, - "peerDependencies": { - "@pulumi/azurerm": "latest" } } diff --git a/examples/cosmosdb/unittests.ts b/examples/cosmosdb/unittests.ts index 188030cdb48a..c2ed28c8b124 100644 --- a/examples/cosmosdb/unittests.ts +++ b/examples/cosmosdb/unittests.ts @@ -1,7 +1,6 @@ // Copyright 2016-2020, Pulumi Corporation. All rights reserved. -import * as azurerm from "../../sdk/nodejs"; -import * as pulumi from "../../sdk/nodejs/node_modules/@pulumi/pulumi"; +import * as pulumi from "@pulumi/pulumi"; import "mocha"; import { distanceBetweenRegions } from "./distance"; diff --git a/examples/examples_nodejs_test.go b/examples/examples_nodejs_test.go index cd66a2cc0b7d..418805a2ca19 100644 --- a/examples/examples_nodejs_test.go +++ b/examples/examples_nodejs_test.go @@ -10,6 +10,24 @@ import ( "github.com/pulumi/pulumi/pkg/v2/testing/integration" ) +func TestAccAppServiceTs(t *testing.T) { + test := getJSBaseOptions(t). + With(integration.ProgramTestOptions{ + Dir: filepath.Join(getCwd(t), "appservice"), + }) + + integration.ProgramTest(t, &test) +} + +func TestAccCosmosDBTs(t *testing.T) { + test := getJSBaseOptions(t). + With(integration.ProgramTestOptions{ + Dir: filepath.Join(getCwd(t), "cosmosdb"), + }) + + integration.ProgramTest(t, &test) +} + func TestAccSimpleTs(t *testing.T) { test := getJSBaseOptions(t). With(integration.ProgramTestOptions{ diff --git a/examples/azure-ts-hdinsight-spark/Pulumi.yaml b/examples/hdinsight-spark/Pulumi.yaml similarity index 100% rename from examples/azure-ts-hdinsight-spark/Pulumi.yaml rename to examples/hdinsight-spark/Pulumi.yaml diff --git a/examples/azure-ts-hdinsight-spark/README.md b/examples/hdinsight-spark/README.md similarity index 100% rename from examples/azure-ts-hdinsight-spark/README.md rename to examples/hdinsight-spark/README.md diff --git a/examples/azure-ts-hdinsight-spark/index.ts b/examples/hdinsight-spark/index.ts similarity index 80% rename from examples/azure-ts-hdinsight-spark/index.ts rename to examples/hdinsight-spark/index.ts index 61081e076735..b6418ce882dd 100644 --- a/examples/azure-ts-hdinsight-spark/index.ts +++ b/examples/hdinsight-spark/index.ts @@ -1,49 +1,56 @@ // Copyright 2020, Pulumi Corporation. All rights reserved. -import * as azurerm from "@pulumi/azurerm"; import * as pulumi from "@pulumi/pulumi"; +import * as random from "@pulumi/random"; + +import * as hdinsight from "@pulumi/azurerm/hdinsight/v20180601preview"; +import * as resources from "@pulumi/azurerm/resources/latest"; +import * as storage from "@pulumi/azurerm/storage/latest"; const config = new pulumi.Config(); const location = config.require("location"); const username = config.require("username"); const password = config.require("password"); +const randomString = new random.RandomString("random", { + length: 12, + special: false, + upper: false, +}); + // Create an Azure Resource Group -const resourceGroup = new azurerm.resources.latest.ResourceGroup("spark-rg", { - resourceGroupName: "azurerm", +const resourceGroup = new resources.ResourceGroup("spark-rg", { + resourceGroupName: randomString.result, location: location, - tags: { - Owner: "azurerm-test", - }, }); // Create a storage account and a container for Spark -const storageAccount = new azurerm.storage.latest.StorageAccount("sparksa", { +const storageAccount = new storage.StorageAccount("sparksa", { resourceGroupName: resourceGroup.name, sku: { name: "Standard_LRS", tier: "Standard", }, - accountName: "sparksa12345", + accountName: randomString.result, location: location, kind: "StorageV2", }); -const storageContainer = new azurerm.storage.latest.BlobContainer("spark", { - containerName: "spark-sc12345", +const storageContainer = new storage.BlobContainer("spark", { + containerName: randomString.result, accountName: storageAccount.name, resourceGroupName: resourceGroup.name, }); const storageAccountKeys = pulumi.all([resourceGroup.name, storageAccount.name, storageAccount.id]).apply( ([resourceGroupName, accountName]) => - azurerm.storage.latest.listStorageAccountKeys({ resourceGroupName, accountName })); + storage.listStorageAccountKeys({ resourceGroupName, accountName })); const primaryStorageKey = storageAccountKeys.keys[0].value; // Create a Spark cluster in HDInsight -const sparkCluster = new azurerm.hdinsight.preview.Cluster("myspark", { - clusterName: "spark-cluster12345", +const sparkCluster = new hdinsight.Cluster("myspark", { + clusterName: randomString.result, resourceGroupName: resourceGroup.name, location: location, properties: { diff --git a/examples/azure-ts-hdinsight-spark/package.json b/examples/hdinsight-spark/package.json similarity index 82% rename from examples/azure-ts-hdinsight-spark/package.json rename to examples/hdinsight-spark/package.json index 65f6359f87c3..534fa2cc29d6 100644 --- a/examples/azure-ts-hdinsight-spark/package.json +++ b/examples/hdinsight-spark/package.json @@ -1,5 +1,5 @@ { - "name": "azure-ts-hdinsight-spark", + "name": "arm-hdinsight-spark", "version": "0.1.0", "devDependencies": { "@types/node": "latest" @@ -8,4 +8,4 @@ "@pulumi/pulumi": "^2.0.0", "@pulumi/random": "^2.0.0" } -} \ No newline at end of file +} diff --git a/examples/azure-ts-hdinsight-spark/tsconfig.json b/examples/hdinsight-spark/tsconfig.json similarity index 100% rename from examples/azure-ts-hdinsight-spark/tsconfig.json rename to examples/hdinsight-spark/tsconfig.json diff --git a/examples/simple/index.ts b/examples/simple/index.ts index bfa22433d28e..924d73f0f485 100644 --- a/examples/simple/index.ts +++ b/examples/simple/index.ts @@ -1,23 +1,25 @@ import * as pulumi from "@pulumi/pulumi"; -import * as azurerm from "@pulumi/azurerm"; import * as random from "@pulumi/random"; +import * as compute from "@pulumi/azurerm/compute/latest"; +import * as containerinstance from "@pulumi/azurerm/containerinstance/latest"; +import * as network from "@pulumi/azurerm/network/latest"; +import * as resources from "@pulumi/azurerm/resources/latest"; +import * as storage from "@pulumi/azurerm/storage/latest"; +import * as web from "@pulumi/azurerm/web/latest"; + const randomString = new random.RandomString("random", { length: 12, special: false, upper: false, -}) +}); -const resourceGroup = new azurerm.resources.latest.ResourceGroup("rg", { +const resourceGroup = new resources.ResourceGroup("rg", { resourceGroupName: randomString.result, location: "westus2", - tags: { - Owner: "mikhailshilkov", - Env: "prod2", - }, }); -const staticSite = new azurerm.web.latest.StaticSite("staticsite", { +const staticSite = new web.StaticSite("staticsite", { resourceGroupName: resourceGroup.name, location: "westus2", repositoryUrl: "", @@ -35,7 +37,7 @@ const staticSite = new azurerm.web.latest.StaticSite("staticsite", { name: randomString.result, }); -const containerinstance = new azurerm.containerinstance.latest.ContainerGroup("containergroup", { +const container = new containerinstance.ContainerGroup("containergroup", { resourceGroupName: resourceGroup.name, // should be autonamed? containerGroupName: randomString.result, @@ -53,7 +55,7 @@ const containerinstance = new azurerm.containerinstance.latest.ContainerGroup("c }], }); -const vnet = new azurerm.network.latest.VirtualNetwork("vnet", { +const vnet = new network.VirtualNetwork("vnet", { resourceGroupName: resourceGroup.name, virtualNetworkName: randomString.result, location: "westus2", @@ -66,14 +68,14 @@ const vnet = new azurerm.network.latest.VirtualNetwork("vnet", { }], }); -const subnet = new azurerm.network.latest.Subnet("subnet2", { +const subnet = new network.Subnet("subnet2", { resourceGroupName: resourceGroup.name, subnetName: randomString.result, virtualNetworkName: vnet.name, addressPrefix: "10.1.1.0/24", }); -const networkInterface = new azurerm.network.latest.NetworkInterface("nic", { +const networkInterface = new network.NetworkInterface("nic", { resourceGroupName: resourceGroup.name, networkInterfaceName: randomString.result, location: "westus2", @@ -86,7 +88,7 @@ const networkInterface = new azurerm.network.latest.NetworkInterface("nic", { }], }); -const virtualmachine = new azurerm.compute.latest.VirtualMachine("vm", { +const virtualmachine = new compute.VirtualMachine("vm", { resourceGroupName: resourceGroup.name, vmName: randomString.result, location: "westus2", @@ -113,7 +115,7 @@ const virtualmachine = new azurerm.compute.latest.VirtualMachine("vm", { }, }); -const appServicePlan = new azurerm.web.latest.AppServicePlan("app-plan", { +const appServicePlan = new web.AppServicePlan("app-plan", { resourceGroupName: resourceGroup.name, name: randomString.result, location: "westus2", @@ -124,14 +126,14 @@ const appServicePlan = new azurerm.web.latest.AppServicePlan("app-plan", { }, }); -const appService = new azurerm.web.latest.WebApp("app", { +const appService = new web.WebApp("app", { resourceGroupName: resourceGroup.name, name: randomString.result, location: "westus2", serverFarmId: appServicePlan.id, }); -const storageAccount = new azurerm.storage.latest.StorageAccount("sa", { +const storageAccount = new storage.StorageAccount("sa", { resourceGroupName: resourceGroup.name, accountName: randomString.result, location: "westus2", @@ -145,9 +147,9 @@ const storageAccount = new azurerm.storage.latest.StorageAccount("sa", { export const staticWebsiteUrl = pulumi.interpolate`https://${staticSite.defaultHostname}`; -export const existingRg = azurerm.resources.latest.getResourceGroup({ resourceGroupName: "Azure-Account-Cleanup" }); +export const existingRg = resources.getResourceGroup({ resourceGroupName: "Azure-Account-Cleanup" }); const storageAccountKeys = pulumi.all([resourceGroup.name, storageAccount.name, storageAccount.id]).apply(([resourceGroupName, accountName]) => - azurerm.storage.latest.listStorageAccountKeys({ resourceGroupName, accountName })); + storage.listStorageAccountKeys({ resourceGroupName, accountName })); export const primaryStorageKey = storageAccountKeys.keys[0].value; diff --git a/examples/static-website/index.ts b/examples/static-website/index.ts index 4a94968eabdc..55bdbc8858c9 100644 --- a/examples/static-website/index.ts +++ b/examples/static-website/index.ts @@ -1,20 +1,26 @@ import * as pulumi from "@pulumi/pulumi"; -import * as azurerm from "../../sdk/nodejs"; +import * as random from "@pulumi/random"; import { URL } from "url"; -const resourceGroup = new azurerm.resources.latest.ResourceGroup("rg", { - resourceGroupName: "azurerm-static-website", +import * as cdn from "@pulumi/azurerm/cdn/latest"; +import * as resources from "@pulumi/azurerm/resources/latest"; +import * as storage from "@pulumi/azurerm/storage/latest"; + +const randomString = new random.RandomString("random", { + length: 12, + special: false, + upper: false, +}); + +const resourceGroup = new resources.ResourceGroup("rg", { + resourceGroupName: randomString.result, location: "westus2", - tags: { - Owner: "mikhailshilkov", - Env: "prod2", - }, }); // Create a Storage Account for our static website -const storageAccount = new azurerm.storage.latest.StorageAccount("websitesa", { +const storageAccount = new storage.StorageAccount("websitesa", { resourceGroupName: resourceGroup.name, - accountName: "pulumiswsa", + accountName: randomString.result, location: "westus2", sku: { name: "Standard_LRS", @@ -46,19 +52,19 @@ export const staticEndpoint = storageAccount.primaryEndpoints.web; const staticHostname = staticEndpoint.apply(url => url ? new URL(url).hostname : ""); // We can add a CDN in front of the website -const cdn = new azurerm.cdn.latest.Profile("website-cdn", { +const profile = new cdn.Profile("website-cdn", { resourceGroupName: resourceGroup.name, - profileName: "pulumi-static-website", + profileName: randomString.result, location: "global", sku: { name: "Standard_Microsoft", }, }); -const endpoint = new azurerm.cdn.latest.Endpoint("website-cdn-ep", { +const endpoint = new cdn.Endpoint("website-cdn-ep", { resourceGroupName: resourceGroup.name, - profileName: cdn.name, - endpointName: "pulumi-static-website-ep", + profileName: profile.name, + endpointName: randomString.result, location: "westus", originHostHeader: staticHostname, origins: [{ diff --git a/examples/static-website/package.json b/examples/static-website/package.json index ea7e02fcf65e..a0faeea7e823 100644 --- a/examples/static-website/package.json +++ b/examples/static-website/package.json @@ -5,9 +5,7 @@ "@types/node": "latest" }, "dependencies": { - "@pulumi/pulumi": "latest" - }, - "peerDependencies": { - "@pulumi/azurerm": "latest" + "@pulumi/pulumi": "^2.0.0", + "@pulumi/random": "^2.0.0" } } diff --git a/examples/template/index.ts b/examples/template/index.ts index f47d239dcbdf..2c44a53e5ece 100644 --- a/examples/template/index.ts +++ b/examples/template/index.ts @@ -1,6 +1,7 @@ import * as pulumi from "@pulumi/pulumi"; +import * as random from "@pulumi/random"; import * as fs from "fs"; -import * as azurerm from "../../sdk/nodejs"; +import * as resources from "@pulumi/azurerm/resources/latest"; interface TemplateResourceArgs { resourceGroupName: string; @@ -14,7 +15,7 @@ class TemplateResource extends pulumi.CustomResource { } interface TemplateArgs { - resourceGroupName: string; + resourceGroupName: pulumi.Output; fileName: string; } @@ -97,9 +98,14 @@ class Template extends pulumi.ComponentResource { } } -const resourceGroupName = "azurermtemplates"; +const randomString = new random.RandomString("random", { + length: 12, + special: false, + upper: false, +}); +const resourceGroupName = randomString.result; -const resourceGroup = new azurerm.resources.latest.ResourceGroup("azurerm", { +const resourceGroup = new resources.ResourceGroup("azurerm", { resourceGroupName, location: "westus2", tags: { diff --git a/examples/template/package.json b/examples/template/package.json index d7dc224ff226..b2fcc81b9054 100644 --- a/examples/template/package.json +++ b/examples/template/package.json @@ -5,9 +5,7 @@ "@types/node": "latest" }, "dependencies": { - "@pulumi/pulumi": "latest" - }, - "peerDependencies": { - "@pulumi/azurerm": "latest" + "@pulumi/pulumi": "^2.0.0", + "@pulumi/random": "^2.0.0" } } diff --git a/provider/cmd/pulumi-gen-azurerm/main.go b/provider/cmd/pulumi-gen-azurerm/main.go index fe25754eb044..8b488fe43451 100644 --- a/provider/cmd/pulumi-gen-azurerm/main.go +++ b/provider/cmd/pulumi-gen-azurerm/main.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package main diff --git a/provider/cmd/pulumi-resource-azurerm/main.go b/provider/cmd/pulumi-resource-azurerm/main.go index 40d2e68ac7cf..c7915d531fb1 100644 --- a/provider/cmd/pulumi-resource-azurerm/main.go +++ b/provider/cmd/pulumi-resource-azurerm/main.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package main diff --git a/provider/pkg/gen/utilities.go b/provider/pkg/gen/utilities.go index d43e983fdaf4..6970e277df7e 100644 --- a/provider/pkg/gen/utilities.go +++ b/provider/pkg/gen/utilities.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package gen diff --git a/provider/pkg/gen/utilities_test.go b/provider/pkg/gen/utilities_test.go index 41e5e03c723c..351de41e9d5f 100644 --- a/provider/pkg/gen/utilities_test.go +++ b/provider/pkg/gen/utilities_test.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package gen diff --git a/provider/pkg/openapi/discover.go b/provider/pkg/openapi/discover.go index 42754eff8e00..2bb9bb50a3fe 100644 --- a/provider/pkg/openapi/discover.go +++ b/provider/pkg/openapi/discover.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package openapi diff --git a/provider/pkg/openapi/discover_test.go b/provider/pkg/openapi/discover_test.go index 5a8222170c1d..62c5c0afe039 100644 --- a/provider/pkg/openapi/discover_test.go +++ b/provider/pkg/openapi/discover_test.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package openapi diff --git a/provider/pkg/openapi/resolver.go b/provider/pkg/openapi/resolver.go index 8fd3bd65c942..ec2ef9b3f4b1 100644 --- a/provider/pkg/openapi/resolver.go +++ b/provider/pkg/openapi/resolver.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package openapi diff --git a/provider/pkg/provider/convert.go b/provider/pkg/provider/convert.go index 2f1912282ea1..67ebe16e6ad3 100644 --- a/provider/pkg/provider/convert.go +++ b/provider/pkg/provider/convert.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package provider diff --git a/provider/pkg/provider/convert_test.go b/provider/pkg/provider/convert_test.go index 1167e08983ee..a0a2ac224e3a 100644 --- a/provider/pkg/provider/convert_test.go +++ b/provider/pkg/provider/convert_test.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package provider diff --git a/provider/pkg/provider/diff.go b/provider/pkg/provider/diff.go index bb634c449085..411140311115 100644 --- a/provider/pkg/provider/diff.go +++ b/provider/pkg/provider/diff.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package provider diff --git a/provider/pkg/provider/diff_test.go b/provider/pkg/provider/diff_test.go index c7d35dcfbf14..98fc7800d94c 100644 --- a/provider/pkg/provider/diff_test.go +++ b/provider/pkg/provider/diff_test.go @@ -1,16 +1,5 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. + package provider import ( diff --git a/provider/pkg/provider/log.go b/provider/pkg/provider/log.go index 7662d98131ea..7c3c737cccca 100644 --- a/provider/pkg/provider/log.go +++ b/provider/pkg/provider/log.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package provider diff --git a/provider/pkg/provider/provider.go b/provider/pkg/provider/provider.go index 7bf5af410977..b9240ac29b37 100644 --- a/provider/pkg/provider/provider.go +++ b/provider/pkg/provider/provider.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package provider diff --git a/provider/pkg/provider/resources.go b/provider/pkg/provider/resources.go index 0682407430f1..b19f399e0a9b 100644 --- a/provider/pkg/provider/resources.go +++ b/provider/pkg/provider/resources.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package provider diff --git a/provider/pkg/provider/serve.go b/provider/pkg/provider/serve.go index d3e0fcddd3b8..9689bc0c81d8 100644 --- a/provider/pkg/provider/serve.go +++ b/provider/pkg/provider/serve.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package provider diff --git a/provider/pkg/version/version.go b/provider/pkg/version/version.go index 5a63c7adab8a..8e63795d8e55 100644 --- a/provider/pkg/version/version.go +++ b/provider/pkg/version/version.go @@ -1,16 +1,4 @@ // Copyright 2016-2020, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package version diff --git a/sdk/python/README.md b/sdk/python/README.md index 265da031e964..73e4801e17d2 100644 --- a/sdk/python/README.md +++ b/sdk/python/README.md @@ -47,5 +47,6 @@ Navigate to one of the `examples` and run Pulumi: ``` $ cd ./exampes/simple +$ yarn link @pulumi/azurerm $ pulumi up ```