Merge pull request pulumi#648 from pulumi/mikhailshilkov/dotnet-20

Update .NET examples to 2.0 betas
azulus · Apr 15, 2020 · f824737 · f824737
2 parents afb0bbe + a89b661
commit f824737
Show file tree

Hide file tree

Showing 38 changed files with 89 additions and 91 deletions.
diff --git a/aws-cs-eks/Aws.EksCluster.csproj b/aws-cs-eks/Aws.EksCluster.csproj
@@ -7,8 +7,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Aws" Version="1.30.0-preview" />
- <PackageReference Include="Pulumi.Kubernetes" Version="1.6.0-preview" />
+ <PackageReference Include="Pulumi.Aws" Version="2.0.0-beta.3" />
+ <PackageReference Include="Pulumi.Kubernetes" Version="2.0.0-beta.2" />
  </ItemGroup>
 
 </Project>
diff --git a/aws-cs-fargate/Infra/Aws.Fargate.csproj b/aws-cs-fargate/Infra/Aws.Fargate.csproj
@@ -7,8 +7,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Aws" Version="1.27.0-preview" />
- <PackageReference Include="Pulumi.Docker" Version="1.4.0-preview" />
+ <PackageReference Include="Pulumi.Aws" Version="2.0.0-beta.3" />
+ <PackageReference Include="Pulumi.Docker" Version="1.5.0-preview" />
  </ItemGroup>
 
 </Project>
diff --git a/aws-cs-fargate/Infra/FargateStack.cs b/aws-cs-fargate/Infra/FargateStack.cs
@@ -16,9 +16,9 @@ class FargateStack : Stack
  public FargateStack()
  {
  // Read back the default VPC and public subnets, which we will use.
- var vpc = Output.Create(Ec2.Invokes.GetVpc(new Ec2.GetVpcArgs {Default = true}));
+ var vpc = Output.Create(Ec2.GetVpc.InvokeAsync(new Ec2.GetVpcArgs {Default = true}));
  var vpcId = vpc.Apply(vpc => vpc.Id);
- var subnet = vpcId.Apply(id => Ec2.Invokes.GetSubnetIds(new Ec2.GetSubnetIdsArgs {VpcId = id}));
+ var subnet = vpcId.Apply(id => Ec2.GetSubnetIds.InvokeAsync(new Ec2.GetSubnetIdsArgs {VpcId = id}));
  var subnetIds = subnet.Apply(s => s.Ids);
 
  // Create a SecurityGroup that permits HTTP ingress and unrestricted egress.
@@ -90,7 +90,7 @@ public FargateStack()
  Port = 80,
  DefaultActions =
  {
- new Elb.Inputs.ListenerDefaultActionsArgs
+ new Elb.Inputs.ListenerDefaultActionArgs
  {
  Type = "forward",
  TargetGroupArn = webTg.Arn,
@@ -102,7 +102,7 @@ public FargateStack()
  var appRepo = new Ecr.Repository("app-repo");
  var appRepoCredentials = appRepo.RegistryId.Apply(async rid =>
  {
- var credentials = await Ecr.Invokes.GetCredentials(new Ecr.GetCredentialsArgs {RegistryId = rid});
+ var credentials = await Ecr.GetCredentials.InvokeAsync(new Ecr.GetCredentialsArgs {RegistryId = rid});
  var data = Convert.FromBase64String(credentials.AuthorizationToken);
  return Encoding.UTF8.GetString(data).Split(":").ToImmutableArray();
  });
@@ -151,7 +151,7 @@ public FargateStack()
  },
  LoadBalancers =
  {
- new Ecs.Inputs.ServiceLoadBalancersArgs
+ new Ecs.Inputs.ServiceLoadBalancerArgs
  {
  TargetGroupArn = webTg.Arn,
  ContainerName = "my-app",

diff --git a/aws-cs-lambda/DotnetLambda/src/DotnetLambda/DotnetLambda.csproj b/aws-cs-lambda/DotnetLambda/src/DotnetLambda/DotnetLambda.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFramework>netcoreapp2.1</TargetFramework>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
  <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
  <AWSProjectType>Lambda</AWSProjectType>
  </PropertyGroup>

diff --git a/aws-cs-lambda/pulumi/Aws.Lambda.csproj b/aws-cs-lambda/pulumi/Aws.Lambda.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Aws" Version="1.27.0-preview" />
+ <PackageReference Include="Pulumi.Aws" Version="2.0.0-beta.3" />
  </ItemGroup>
 
 </Project>
diff --git a/aws-cs-lambda/pulumi/LambdaStack.cs b/aws-cs-lambda/pulumi/LambdaStack.cs
@@ -10,8 +10,8 @@ public LambdaStack()
  {
  var lambda = new Function("basicLambda", new FunctionArgs
  {
- Runtime = "dotnetcore2.1",
- Code = new FileArchive("../DotnetLambda/src/DotnetLambda/bin/Debug/netcoreapp2.1/publish"),
+ Runtime = "dotnetcore3.1",
+ Code = new FileArchive("../DotnetLambda/src/DotnetLambda/bin/Debug/netcoreapp3.1/publish"),
  Handler = "DotnetLambda::DotnetLambda.Function::FunctionHandler",
  Role = CreateLambdaRole().Arn
  });

diff --git a/aws-cs-webserver/Aws.WebServer.csproj b/aws-cs-webserver/Aws.WebServer.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Aws" Version="1.27.0-preview" />
+ <PackageReference Include="Pulumi.Aws" Version="2.0.0-beta.3" />
  </ItemGroup>
 
 </Project>
diff --git a/aws-cs-webserver/WebServerStack.cs b/aws-cs-webserver/WebServerStack.cs
@@ -10,11 +10,11 @@ class WebServerStack : Stack
 {
  public WebServerStack()
  {
- var ami = Output.Create(Pulumi.Aws.Invokes.GetAmi(new GetAmiArgs
+ var ami = Output.Create(GetAmi.InvokeAsync(new GetAmiArgs
  {
  MostRecent = true,
  Owners = {"137112412989"},
- Filters = {new GetAmiFiltersArgs {Name = "name", Values = {"amzn-ami-hvm-*"}}}
+ Filters = {new GetAmiFilterArgs {Name = "name", Values = {"amzn-ami-hvm-*"}}}
  }));
 
  var group = new SecurityGroup("web-secgrp", new SecurityGroupArgs

diff --git a/aws-fs-lambda-webserver/LambdaWebServer/LambdaWebServer.fsproj b/aws-fs-lambda-webserver/LambdaWebServer/LambdaWebServer.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
  <PropertyGroup>
- <TargetFramework>netcoreapp2.1</TargetFramework>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
  <DebugType>portable</DebugType>
  <OutputType>Exe</OutputType>
  <EnableDefaultContentItems>false</EnableDefaultContentItems>

diff --git a/aws-fs-lambda-webserver/pulumi/Aws.LambdaWebServer.fsproj b/aws-fs-lambda-webserver/pulumi/Aws.LambdaWebServer.fsproj
@@ -10,7 +10,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Aws" Version="1.27.0-preview" />
- <PackageReference Include="Pulumi.FSharp" Version="1.12.1-preview" />
+ <PackageReference Include="Pulumi.Aws" Version="2.0.0-beta.3" />
+ <PackageReference Include="Pulumi.FSharp" Version="2.0.0-beta.2" />
  </ItemGroup>
 </Project>
diff --git a/aws-fs-lambda-webserver/pulumi/Program.fs b/aws-fs-lambda-webserver/pulumi/Program.fs
@@ -65,8 +65,7 @@ let addInvokePermission name accountId functionArn executionArn =
  |> ignore
 
 let infra () =
- let configSection = Pulumi.Config()
- let accountId = configSection.Get "awsAccount"
+ let accountId = Output.Create<GetCallerIdentityResult>(Pulumi.Aws.GetCallerIdentity.InvokeAsync()).Apply(fun r -> r.AccountId)
 
  let lambdaRole =
  Role (
@@ -96,8 +95,8 @@ let infra () =
  Function(
  "basicLambda",
  FunctionArgs(
- Runtime = input "dotnetcore2.1",
- Code = input (FileArchive "../LambdaWebServer/bin/Debug/netcoreapp2.1/publish" :> Archive),
+ Runtime = input "dotnetcore3.1",
+ Code = input (FileArchive "../LambdaWebServer/bin/Debug/netcoreapp3.1/publish" :> Archive),
  Handler = input "LambdaWebServer::Setup+LambdaEntryPoint::FunctionHandlerAsync",
  Role = io lambdaRole.Arn,
  Timeout = input 30
@@ -129,8 +128,8 @@ let infra () =
  )
  )
 
- addInvokePermission "lambdaPermission1" (input accountId) (io lambda.Arn) (deployment.ExecutionArn |> Outputs.apply (fun arn -> arn + "*/*/") |> io)
- addInvokePermission "lambdaPermission2" (input accountId) (io lambda.Arn) (deployment.ExecutionArn |> Outputs.apply (fun arn -> arn + "*/*/*") |> io)
+ addInvokePermission "lambdaPermission1" (io accountId) (io lambda.Arn) (deployment.ExecutionArn |> Outputs.apply (fun arn -> arn + "*/*/") |> io)
+ addInvokePermission "lambdaPermission2" (io accountId) (io lambda.Arn) (deployment.ExecutionArn |> Outputs.apply (fun arn -> arn + "*/*/*") |> io)
 
  let urlWithTrailingSlash =
  prodStage.InvokeUrl

diff --git a/azure-cs-aks-private-container-registry/Azure.AKS.PrivateContainerRegistry.csproj b/azure-cs-aks-private-container-registry/Azure.AKS.PrivateContainerRegistry.csproj
@@ -7,12 +7,12 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview"/>
- <PackageReference Include="Pulumi.AzureAD" Version="1.6.0-preview"/>
- <PackageReference Include="Pulumi.Docker" Version="1.4.0-preview"/>
- <PackageReference Include="Pulumi.Kubernetes" Version="1.5.8-preview"/>
- <PackageReference Include="Pulumi.Random" Version="1.6.0-preview"/>
- <PackageReference Include="Pulumi.Tls" Version="1.5.0-preview"/>
+ <PackageReference Include="Pulumi.Azure" Version="3.0.0-beta.2" />
+ <PackageReference Include="Pulumi.AzureAD" Version="2.0.0-beta.3" />
+ <PackageReference Include="Pulumi.Docker" Version="1.5.0-preview"/>
+ <PackageReference Include="Pulumi.Kubernetes" Version="2.0.0-beta.2"/>
+ <PackageReference Include="Pulumi.Random" Version="2.0.0-beta.5" />
+ <PackageReference Include="Pulumi.Tls" Version="2.0.0-beta.1" />
  </ItemGroup>
 
  <ItemGroup>

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="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" />
+ <PackageReference Include="Pulumi.Azure" Version="3.0.0-beta.2" />
+ <PackageReference Include="Pulumi.AzureAD" Version="2.0.0-beta.3" />
+ <PackageReference Include="Pulumi.Random" Version="2.0.0-beta.5" />
+ <PackageReference Include="Pulumi.Tls" Version="2.0.0-beta.1" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-appservice/AppServiceStack.cs b/azure-cs-appservice/AppServiceStack.cs
@@ -75,7 +75,7 @@ public AppServiceStack()
  },
  ConnectionStrings =
  {
- new AppServiceConnectionStringsArgs
+ new AppServiceConnectionStringArgs
  {
  Name = "db",
  Type = "SQLAzure",

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="2.1.0-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="3.0.0-beta.2" />
  </ItemGroup>
 
 </Project>
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="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.Azure" Version="3.0.0-beta.2" />
+ <PackageReference Include="Pulumi.AzureAD" Version="2.0.0-beta.3" />
+ <PackageReference Include="Pulumi.Random" Version="2.0.0-beta.5" />
  </ItemGroup>
 
 </Project>
diff --git a/azure-cs-cosmosapp-component/Azure.CosmosAppComponent.csproj b/azure-cs-cosmosapp-component/Azure.CosmosAppComponent.csproj
@@ -7,8 +7,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Pulumi.Azure" Version="2.1.0-preview" />
- <PackageReference Include="Pulumi.Docker" Version="1.4.0-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="3.0.0-beta.2" />
+ <PackageReference Include="Pulumi.Docker" Version="1.5.0-preview"/>
  </ItemGroup>
 
  <PropertyGroup>

diff --git a/azure-cs-cosmosapp-component/Containers.cs b/azure-cs-cosmosapp-component/Containers.cs
@@ -52,7 +52,7 @@ public static Output<string> Run()
  Location = region.Location,
  ImageRegistryCredentials =
  {
- new GroupImageRegistryCredentialsArgs
+ new GroupImageRegistryCredentialArgs
  {
  Server = registry.LoginServer,
  Username = registry.AdminUsername,
@@ -62,15 +62,15 @@ public static Output<string> Run()
  OsType = "Linux",
  Containers =
  {
- new GroupContainersArgs
+ new GroupContainerArgs
  {
  Cpu = 0.5,
  Image = dockerImage.ImageName,
  Memory = 1.5,
  Name = "hello-world",
  Ports =
  {
- new GroupContainersPortsArgs
+ new GroupContainerPortArgs
  {
  Port = 80,
  Protocol = "TCP",

diff --git a/azure-cs-cosmosapp-component/CosmosApp.cs b/azure-cs-cosmosapp-component/CosmosApp.cs
@@ -105,7 +105,7 @@ public CosmosApp(string name, CosmosAppArgs args, ComponentResourceOptions? opti
  {
  ResourceGroupName = resourceGroup.Name,
  Location = primaryLocation,
- GeoLocations = locations.Select((l, i) => new AccountGeoLocationsArgs { Location = l, FailoverPriority = i }).ToArray(),
+ GeoLocations = locations.Select((l, i) => new AccountGeoLocationArgs { Location = l, FailoverPriority = i }).ToArray(),
  OfferType = "Standard",
  ConsistencyPolicy = new AccountConsistencyPolicyArgs { ConsistencyLevel = "Session" },
  EnableMultipleWriteLocations = args.EnableMultiMaster,

diff --git a/azure-cs-cosmosapp-component/VmScaleSets.cs b/azure-cs-cosmosapp-component/VmScaleSets.cs
@@ -68,7 +68,7 @@ public Builder(ResourceGroup resourceGroup)
  Location = location,
  FrontendIpConfigurations =
  {
- new LoadBalancerFrontendIpConfigurationsArgs
+ new LoadBalancerFrontendIpConfigurationArgs
  {
  Name = "PublicIPAddress",
  PublicIpAddressId = publicIp.Id,
@@ -138,11 +138,11 @@ public Builder(ResourceGroup resourceGroup)
  Location = location,
  NetworkProfiles =
  {
- new ScaleSetNetworkProfilesArgs
+ new ScaleSetNetworkProfileArgs
  {
  IpConfigurations =
  {
- new ScaleSetNetworkProfilesIpConfigurationsArgs
+ new ScaleSetNetworkProfileIpConfigurationArgs
  {
  LoadBalancerBackendAddressPoolIds = {bpepool.Id},
  Name = "IPConfiguration",
@@ -171,7 +171,7 @@ public Builder(ResourceGroup resourceGroup)
  },
  StorageProfileDataDisks =
  {
- new ScaleSetStorageProfileDataDisksArgs
+ new ScaleSetStorageProfileDataDiskArgs
  {
  Caching = "ReadWrite",
  CreateOption = "Empty",
@@ -212,9 +212,9 @@ public Builder(ResourceGroup resourceGroup)
  },
  Profiles =
  {
- new AutoscaleSettingProfilesArgs
+ new AutoscaleSettingProfileArgs
  {
- Capacity = new AutoscaleSettingProfilesCapacityArgs
+ Capacity = new AutoscaleSettingProfileCapacityArgs
  {
  Default = 1,
  Maximum = 10,
@@ -223,9 +223,9 @@ public Builder(ResourceGroup resourceGroup)
  Name = "defaultProfile",
  Rules =
  {
- new AutoscaleSettingProfilesRulesArgs
+ new AutoscaleSettingProfileRuleArgs
  {
- MetricTrigger = new AutoscaleSettingProfilesRulesMetricTriggerArgs
+ MetricTrigger = new AutoscaleSettingProfileRuleMetricTriggerArgs
  {
  MetricName = "Percentage CPU",
  MetricResourceId = scaleSet.Id,
@@ -236,17 +236,17 @@ public Builder(ResourceGroup resourceGroup)
  TimeGrain = "PT1M",
  TimeWindow = "PT5M",
  },
- ScaleAction = new AutoscaleSettingProfilesRulesScaleActionArgs
+ ScaleAction = new AutoscaleSettingProfileRuleScaleActionArgs
  {
  Cooldown = "PT1M",
  Direction = "Increase",
  Type = "ChangeCount",
  Value = 1,
  },
  },
- new AutoscaleSettingProfilesRulesArgs
+ new AutoscaleSettingProfileRuleArgs
  {
- MetricTrigger = new AutoscaleSettingProfilesRulesMetricTriggerArgs
+ MetricTrigger = new AutoscaleSettingProfileRuleMetricTriggerArgs
  {
  MetricName = "Percentage CPU",
  MetricResourceId = scaleSet.Id,
@@ -257,7 +257,7 @@ public Builder(ResourceGroup resourceGroup)
  TimeGrain = "PT1M",
  TimeWindow = "PT5M",
  },
- ScaleAction = new AutoscaleSettingProfilesRulesScaleActionArgs
+ ScaleAction = new AutoscaleSettingProfileRuleScaleActionArgs
  {
  Cooldown = "PT1M",
  Direction = "Decrease",

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="2.1.0-preview" />
+ <PackageReference Include="Pulumi.Azure" Version="3.0.0-beta.2" />
  </ItemGroup>
 
  <PropertyGroup>

diff --git a/azure-cs-msi-keyvault-rbac/AppStack.cs b/azure-cs-msi-keyvault-rbac/AppStack.cs
@@ -87,7 +87,7 @@ public AppStack()
  Source = new FileArchive("./webapp/bin/Debug/netcoreapp2.2/publish"),
  });
 
- var clientConfig = Output.Create(Pulumi.Azure.Core.Invokes.GetClientConfig());
+ var clientConfig = Output.Create(GetClientConfig.InvokeAsync());
  var tenantId = clientConfig.Apply(c => c.TenantId);
  var currentPrincipal = clientConfig.Apply(c => c.ObjectId);
 
@@ -99,7 +99,7 @@ public AppStack()
  TenantId = tenantId,
  AccessPolicies =
  {
- new KeyVaultAccessPoliciesArgs
+ new KeyVaultAccessPolicyArgs
  {
  TenantId = tenantId,
  // The current principal has to be granted permissions to Key Vault so that it can actually add and then remove
@@ -137,7 +137,7 @@ public AppStack()
  },
  ConnectionStrings =
  {
- new AppServiceConnectionStringsArgs
+ new AppServiceConnectionStringArgs
  {
  Name = "db",
  Type = "SQLAzure",