Update some .NET examples to Azure 2.1 (pulumi#603)

Update some .NET examples to Azure 2.1
stack72 · Mar 16, 2020 · d825b81 · d825b81
1 parent ff4cee2
commit d825b81
Show file tree

Hide file tree

Showing 17 changed files with 71 additions and 82 deletions.
diff --git a/Examples.sln b/Examples.sln
@@ -29,6 +29,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digitalocean.K8s", "digital
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Azure.Aci", "azure-fs-aci\Azure.Aci.fsproj", "{9F646ECF-9CD3-4686-8C4C-FE6AAAD29FEC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.AKS.PrivateContainerRegistry", "azure-cs-aks-private-container-registry\Azure.AKS.PrivateContainerRegistry.csproj", "{23099098-BEE1-4199-B1AB-8864DE7276DA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "azure-cs-static-website", "azure-cs-static-website\azure-cs-static-website.csproj", "{4DEEF787-D589-44C5-AAB1-570D2D920043}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Azure.Aks", "azure-fs-aks\Azure.Aks.fsproj", "{555DED90-15AE-4620-ACEE-B53EC237C62B}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -87,6 +93,18 @@ Global
  {9F646ECF-9CD3-4686-8C4C-FE6AAAD29FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {9F646ECF-9CD3-4686-8C4C-FE6AAAD29FEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {9F646ECF-9CD3-4686-8C4C-FE6AAAD29FEC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {23099098-BEE1-4199-B1AB-8864DE7276DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {23099098-BEE1-4199-B1AB-8864DE7276DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {23099098-BEE1-4199-B1AB-8864DE7276DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {23099098-BEE1-4199-B1AB-8864DE7276DA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4DEEF787-D589-44C5-AAB1-570D2D920043}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4DEEF787-D589-44C5-AAB1-570D2D920043}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4DEEF787-D589-44C5-AAB1-570D2D920043}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4DEEF787-D589-44C5-AAB1-570D2D920043}.Release|Any CPU.Build.0 = Release|Any CPU
+ {555DED90-15AE-4620-ACEE-B53EC237C62B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {555DED90-15AE-4620-ACEE-B53EC237C62B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {555DED90-15AE-4620-ACEE-B53EC237C62B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {555DED90-15AE-4620-ACEE-B53EC237C62B}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

diff --git a/azure-cs-aks/Azure.AKS.csproj b/azure-cs-aks/Azure.AKS.csproj
@@ -7,10 +7,10 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Azure" Version="1.14.0-preview" />
- <PackageReference Include="Pulumi.AzureAD" Version="1.5.0-preview" />
- <PackageReference Include="Pulumi.Random" Version="1.5.0-preview" />
- <PackageReference Include="Pulumi.Tls" Version="1.4.0-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview" />
+ <PackageReference Include="Pulumi.AzureAD" Version="1.6.0-preview" />
+ <PackageReference Include="Pulumi.Random" Version="1.6.0-preview" />
+ <PackageReference Include="Pulumi.Tls" Version="1.5.0-preview" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-appservice/Azure.AppService.csproj b/azure-cs-appservice/Azure.AppService.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Azure" Version="1.8.0-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-appservice/Program.cs b/azure-cs-appservice/Program.cs
@@ -41,12 +41,12 @@ static Task<int> Main()
  ContainerAccessType = "private",
  });
 
- var blob = new ZipBlob("zip", new ZipBlobArgs
+ var blob = new Blob("zip", new BlobArgs
  {
  StorageAccountName = storageAccount.Name,
  StorageContainerName = container.Name,
- Type = "block",
- Content = new FileArchive("wwwroot"),
+ Type = "Block",
+ Source = new FileArchive("wwwroot"),
  });
 
  var codeBlobUrl = SharedAccessSignature.SignedBlobReadUrl(blob, storageAccount);

diff --git a/azure-cs-botservice/Azure.BotService.csproj b/azure-cs-botservice/Azure.BotService.csproj
@@ -13,9 +13,9 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Azure" Version="1.8.0-preview" />
- <PackageReference Include="Pulumi.AzureAD" Version="1.4.0-preview" />
- <PackageReference Include="Pulumi.Random" Version="1.4.0-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview" />
+ <PackageReference Include="Pulumi.AzureAD" Version="1.6.0-preview" />
+ <PackageReference Include="Pulumi.Random" Version="1.6.0-preview" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-botservice/Program.cs b/azure-cs-botservice/Program.cs
@@ -5,7 +5,6 @@
 using Pulumi.Azure.AppService;
 using Pulumi.Azure.AppService.Inputs;
 using Pulumi.Azure.Bot;
-using Pulumi.Azure.Cognitive.Inputs;
 using Pulumi.Azure.Core;
 using Pulumi.AzureAD;
 using Pulumi.Random;
@@ -49,12 +48,12 @@ static Task<int> Main()
  ContainerAccessType = "private",
  });
 
- var blob = new Storage.ZipBlob("zip", new Storage.ZipBlobArgs
+ var blob = new Storage.Blob("zip", new Storage.BlobArgs
  {
  StorageAccountName = storageAccount.Name,
  StorageContainerName = container.Name,
- Type = "block",
- Content = new FileArchive("bot/publish")
+ Type = "Block",
+ Source = new FileArchive("bot/publish")
  });
 
  var codeBlobUrl = Storage.SharedAccessSignature.SignedBlobReadUrl(blob, storageAccount);
@@ -75,7 +74,7 @@ static Task<int> Main()
  {
  Kind = "CognitiveServices", // includes LUIS
  ResourceGroupName = resourceGroup.Name,
- Sku = new AccountSkuArgs { Name = "S0", Tier = "Standard" }
+ SkuName = "S0"
  });
 
  var msa = new Application("msapp", new ApplicationArgs

diff --git a/azure-cs-functions-raw/Azure.FunctionsRaw.csproj b/azure-cs-functions-raw/Azure.FunctionsRaw.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Azure" Version="1.8.0-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview" />
  </ItemGroup>
 
  <PropertyGroup>

diff --git a/azure-cs-functions-raw/Program.cs b/azure-cs-functions-raw/Program.cs
@@ -40,12 +40,12 @@ static Task<int> Main()
  ContainerAccessType = "private",
  });
 
- var blob = new ZipBlob("zip", new ZipBlobArgs
+ var blob = new Blob("zip", new BlobArgs
  {
  StorageAccountName = storageAccount.Name,
  StorageContainerName = container.Name,
- Type = "block",
- Content = new FileArchive("./functions/bin/Debug/netcoreapp3.0/publish"),
+ Type = "Block",
+ Source = new FileArchive("./functions/bin/Debug/netcoreapp3.1/publish"),
  });
 
  var codeBlobUrl = SharedAccessSignature.SignedBlobReadUrl(blob, storageAccount);

diff --git a/azure-cs-functions-raw/functions/Functions.csproj b/azure-cs-functions-raw/functions/Functions.csproj
@@ -2,11 +2,11 @@
 
  <PropertyGroup>
  <TargetFramework>netcoreapp3.1</TargetFramework>
- <AzureFunctionsVersion>v3-preview</AzureFunctionsVersion>
+ <AzureFunctionsVersion>v3</AzureFunctionsVersion>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.30-beta2" />
+ <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.5" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/azure-cs-msi-keyvault-rbac/Azure.KeyVault.csproj b/azure-cs-msi-keyvault-rbac/Azure.KeyVault.csproj
@@ -7,8 +7,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Azure" Version="1.8.0-preview" />
- <PackageReference Include="Pulumi.Random" Version="1.4.0-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview" />
+ <PackageReference Include="Pulumi.Random" Version="1.6.0-preview" />
  </ItemGroup>
 
  <PropertyGroup>

diff --git a/azure-cs-msi-keyvault-rbac/Program.cs b/azure-cs-msi-keyvault-rbac/Program.cs
@@ -65,8 +65,8 @@ static Task<int> Main()
  {
  StorageAccountName = storageAccount.Name,
  StorageContainerName = storageContainer.Name,
- Type = "block",
- Source = "./README.md",
+ Type = "Block",
+ Source = new FileAsset("./README.md"),
  });
 
  // A plan to host the App Service
@@ -82,12 +82,12 @@ static Task<int> Main()
  });
 
  // ASP.NET deployment package
- var blob = new ZipBlob("zip", new ZipBlobArgs
+ var blob = new Blob("zip", new BlobArgs
  {
  StorageAccountName = storageAccount.Name,
  StorageContainerName = storageContainer.Name,
- Type = "block",
- Content = new FileArchive("./webapp/bin/Debug/netcoreapp2.2/publish"),
+ Type = "Block",
+ Source = new FileArchive("./webapp/bin/Debug/netcoreapp2.2/publish"),
  });
 
  var clientConfig = await Pulumi.Azure.Core.Invokes.GetClientConfig();
@@ -119,7 +119,7 @@ static Task<int> Main()
  KeyVaultId = vault.Id,
  Value = SharedAccessSignature.SignedBlobReadUrl(blob, storageAccount),
  });
- var secretUri = Output.Format($"{secret.VaultUri}secrets/{secret.Name}/{secret.Version}");
+ var secretUri = Output.Format($"{vault.VaultUri}secrets/{secret.Name}/{secret.Version}");
 
 
  // The application hosted in App Service

diff --git a/azure-cs-static-website/Program.cs b/azure-cs-static-website/Program.cs
@@ -1,11 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Azure.Storage;
-using Microsoft.Azure.Storage.Blob;
-using Microsoft.Azure.Storage.Shared.Protocol;
 using Pulumi;
 using Pulumi.Azure.Core;
 using Pulumi.Azure.Storage;
+using Pulumi.Azure.Storage.Inputs;
 
 class Program
 {
@@ -23,13 +21,12 @@ static Task<int> Main()
  EnableHttpsTrafficOnly = true,
  AccountReplicationType = "LRS",
  AccountTier = "Standard",
- AccountKind = "StorageV2"
+ AccountKind = "StorageV2",
+ StaticWebsite = new AccountStaticWebsiteArgs
+ {
+ IndexDocument = "index.html"
+ }
  });
-
- // We can't enable static sites using Pulumi (it's not exposed in the ARM API).
- // Therefore we have to invoke the Azure SDK from within the Pulumi code to enable the static sites 
- // The code in the Apply method must be idempotent.
- var containerName = storageAccount.PrimaryBlobConnectionString.Apply(async v => await EnableStaticSites(v) );
  
  // Upload the files
  var files = new[]{"index.html", "404.html"};
@@ -39,41 +36,18 @@ static Task<int> Main()
  {
  Name = file,
  StorageAccountName = storageAccount.Name,
- StorageContainerName =containerName,
+ StorageContainerName = "$web",
  Type = "Block",
- Source = $"./wwwroot/{file}",
+ Source = new FileAsset($"./wwwroot/{file}"),
  ContentType = "text/html",
  });
  }
  
  // Export the Web address string for the storage account
- return new Dictionary<string, object>
+ return new Dictionary<string, object?>
  {
  { "staticEndpoint", storageAccount.PrimaryWebEndpoint },
  };
  });
-
-
- static async Task<string> EnableStaticSites(string connectionString)
- {
- if (!Deployment.Instance.IsDryRun)
- {
- var sa = CloudStorageAccount.Parse(connectionString);
-
- var blobClient = sa.CreateCloudBlobClient();
- var blobServiceProperties = new ServiceProperties
- {
- StaticWebsite = new StaticWebsiteProperties
- {
- Enabled = true,
- IndexDocument = "index.html",
- ErrorDocument404Path = "404.html"
- }
- };
- await blobClient.SetServicePropertiesAsync(blobServiceProperties);
- }
-
- return "$web";
- }
  }
 }
diff --git a/azure-cs-static-website/azure-cs-static-website.csproj b/azure-cs-static-website/azure-cs-static-website.csproj
@@ -2,14 +2,12 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.0</TargetFramework>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
  <Nullable>enable</Nullable>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Azure" Version="1.4.0-preview" />
- <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.2" />
- <PackageReference Include="Microsoft.Azure.Storage.Common" Version="11.1.2"/>
+ <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-webserver/Azure.WebServer.csproj b/azure-cs-webserver/Azure.WebServer.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Azure" Version="1.8.0-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-fs-aks/Azure.Aks.fsproj b/azure-fs-aks/Azure.Aks.fsproj
@@ -9,10 +9,10 @@
  <Compile Include="Program.fs" />
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="Pulumi.Azure" Version="1.14.0-preview" />
- <PackageReference Include="Pulumi.AzureAD" Version="1.5.0-preview" />
- <PackageReference Include="Pulumi.FSharp" Version="1.10.1-preview" />
- <PackageReference Include="Pulumi.Random" Version="1.5.0-preview" />
- <PackageReference Include="Pulumi.Tls" Version="1.4.0-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview" />
+ <PackageReference Include="Pulumi.AzureAD" Version="1.6.0-preview" />
+ <PackageReference Include="Pulumi.FSharp" Version="1.12.1-preview" />
+ <PackageReference Include="Pulumi.Random" Version="1.6.0-preview" />
+ <PackageReference Include="Pulumi.Tls" Version="1.5.0-preview" />
  </ItemGroup>
 </Project>
diff --git a/azure-fs-appservice/Azure.AppService.fsproj b/azure-fs-appservice/Azure.AppService.fsproj
@@ -10,8 +10,8 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.FSharp" Version="1.7.0-preview" />
- <PackageReference Include="Pulumi.Azure" Version="1.8.0-preview" />
+ <PackageReference Include="Pulumi.FSharp" Version="1.12.1-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-fs-appservice/Program.fs b/azure-fs-appservice/Program.fs
@@ -32,14 +32,14 @@ let infra () =
  (StorageAccountName = io storageAccount.Name,
  ContainerAccessType = input "private"))
 
- let archive = FileArchive("wwwroot") :> Archive
+ let archive = FileArchive("wwwroot") :> AssetOrArchive
  let blob =
- ZipBlob("zip", 
- ZipBlobArgs
+ Blob("zip", 
+ BlobArgs
  (StorageAccountName = io storageAccount.Name,
  StorageContainerName = io container.Name,
- Type = input "block",
- Content = input archive))
+ Type = input "Block",
+ Source = input archive))
 
  let codeBlobUrl = SharedAccessSignature.SignedBlobReadUrl(blob, storageAccount)