pulumi · cnunciato · Jul 28, 2023 · Jul 28, 2023 · Jul 28, 2023 · Jul 28, 2023
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -52,7 +52,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         platform:
         - ubuntu-latest
         source-dir:
@@ -186,7 +186,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:
@@ -327,7 +327,7 @@ jobs:
         - EquinixMetal
         - Cloud
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         examples-test-matrix:
         - default
         goversion:
@@ -473,7 +473,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:
@@ -577,7 +577,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:

diff --git a/.github/workflows/performance_metrics_cron.yml b/.github/workflows/performance_metrics_cron.yml
@@ -104,7 +104,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnet-version:
-          - 3.1.301
+          - 6.0.114
         go-version:
           - 1.19.x
         node-version:

diff --git a/.github/workflows/run-tests-command.yml b/.github/workflows/run-tests-command.yml
@@ -73,7 +73,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         platform:
         - ubuntu-latest
         source-dir:
@@ -211,7 +211,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:
@@ -362,7 +362,7 @@ jobs:
         - EquinixMetal
         - Cloud
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         languages:
@@ -527,7 +527,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:
@@ -633,7 +633,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:

diff --git a/.github/workflows/smoke-test-cli-command.yml b/.github/workflows/smoke-test-cli-command.yml
@@ -49,7 +49,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         platform:
         - ubuntu-latest
         source-dir:
@@ -185,7 +185,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:
@@ -300,7 +300,7 @@ jobs:
         - EquinixMetal
         - Cloud
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         languages:
@@ -444,7 +444,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:
@@ -548,7 +548,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:

diff --git a/.github/workflows/smoke-test-provider-command.yml b/.github/workflows/smoke-test-provider-command.yml
@@ -49,7 +49,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         platform:
         - ubuntu-latest
         source-dir:
@@ -185,7 +185,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:
@@ -293,7 +293,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         languages:
@@ -437,7 +437,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:
@@ -541,7 +541,7 @@ jobs:
       fail-fast: false
       matrix:
         dotnetversion:
-        - 3.1.301
+        - 6.0.114
         goversion:
         - 1.19.x
         nodeversion:

diff --git a/aws-cs-ansible-wordpress/pulumi-ansible-wordpress.csproj b/aws-cs-ansible-wordpress/pulumi-ansible-wordpress.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 

diff --git a/aws-cs-assume-role/assume-role/assume-role.csproj b/aws-cs-assume-role/assume-role/assume-role.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/aws-cs-assume-role/create-role/create-role.csproj b/aws-cs-assume-role/create-role/create-role.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/aws-cs-eks/Aws.EksCluster.csproj b/aws-cs-eks/Aws.EksCluster.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/aws-cs-fargate/App/aws-cs-fargate.csproj b/aws-cs-fargate/App/aws-cs-fargate.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>dotnet_core_tutorial</RootNamespace>
   </PropertyGroup>
 

diff --git a/aws-cs-fargate/Infra/Aws.Fargate.csproj b/aws-cs-fargate/Infra/Aws.Fargate.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

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>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/aws-cs-lambda/pulumi/LambdaStack.cs b/aws-cs-lambda/pulumi/LambdaStack.cs
@@ -11,7 +11,7 @@ public LambdaStack()
         var lambda = new Function("basicLambda", new FunctionArgs
         {
             Runtime = "dotnetcore3.1",
-            Code = new FileArchive("../DotnetLambda/src/DotnetLambda/bin/Debug/netcoreapp3.1/publish"),
+            Code = new FileArchive("../DotnetLambda/src/DotnetLambda/bin/Debug/net6.0/publish"),
             Handler = "DotnetLambda::DotnetLambda.Function::FunctionHandler",
             Role = CreateLambdaRole().Arn
         });

diff --git a/aws-cs-s3-folder/WebsiteStack.cs b/aws-cs-s3-folder/WebsiteStack.cs
@@ -17,6 +17,21 @@ public WebsiteStack()
             }
         });
 
+        var ownershipControls = new BucketOwnershipControls("ownership-controls", new()
+        {
+            Bucket = bucket.Id,
+            Rule = new BucketOwnershipControlsRuleArgs
+            {
+                ObjectOwnership = "ObjectWriter",
+            },
+        }, new CustomResourceOptions {Parent = bucket});
+
+        var publicAccessBlock = new BucketPublicAccessBlock("public-access-block", new()
+        {
+            Bucket = bucket.Id,
+            BlockPublicAcls = false,
+        }, new CustomResourceOptions {Parent = bucket});
+
         // For each file in wwwroot ...
         var files = Directory.GetFiles("wwwroot");
         foreach (var file in files)
@@ -31,7 +46,7 @@ public WebsiteStack()
                 Bucket = bucket.BucketName,
                 ContentType = contentType,
                 Source = new FileAsset(file)
-            }, new CustomResourceOptions {Parent = bucket});
+            }, new CustomResourceOptions {Parent = bucket, DependsOn = new Pulumi.Resource[]{ publicAccessBlock, ownershipControls }});
         }
 
         this.Endpoint = Output.Format($"http://{bucket.WebsiteEndpoint}");

diff --git a/aws-cs-s3-folder/aws-cs-s3-folder.csproj b/aws-cs-s3-folder/aws-cs-s3-folder.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Examples</RootNamespace>
   </PropertyGroup>

diff --git a/aws-cs-secrets-manager/aws-cs-secrets-manager.csproj b/aws-cs-secrets-manager/aws-cs-secrets-manager.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/aws-cs-webserver/Aws.WebServer.csproj b/aws-cs-webserver/Aws.WebServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

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>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/aws-fs-lambda-webserver/pulumi/Program.fs b/aws-fs-lambda-webserver/pulumi/Program.fs
@@ -95,7 +95,7 @@ let infra () =
             "basicLambda",
             FunctionArgs(
                 Runtime = inputUnion2Of2 Pulumi.Aws.Lambda.Runtime.DotnetCore3d1,
-                Code    = input (FileArchive "../LambdaWebServer/bin/Debug/netcoreapp3.1/publish" :> Archive),
+                Code    = input (FileArchive "../LambdaWebServer/bin/Debug/net6.0/publish" :> Archive),
                 Handler = input "LambdaWebServer::Setup+LambdaEntryPoint::FunctionHandlerAsync",
                 Role    = io lambdaRole.Arn,
                 Timeout = input 30

diff --git a/aws-fs-s3-folder/Program.fs b/aws-fs-s3-folder/Program.fs
@@ -12,7 +12,21 @@ let infra () =
     let bucket =
         Bucket("my-bucket",
                BucketArgs (Website = input (BucketWebsiteArgs (IndexDocument = input "index.html"))))
-
+
+    let ownershipControls = 
+        BucketOwnershipControls("ownership-controls",
+                                BucketOwnershipControlsArgs
+                                    (Bucket = io bucket.Id,
+                                     Rule = input (BucketOwnershipControlsRuleArgs(ObjectOwnership = input "ObjectWriter"))),
+                                CustomResourceOptions (Parent = bucket))
+
+    let publicAccessBlock = 
+        BucketPublicAccessBlock("public-access-block",
+                                BucketPublicAccessBlockArgs
+                                    (Bucket = io bucket.Id,
+                                     BlockPublicAcls = input false),
+                                CustomResourceOptions (Parent = bucket))
+
     // For each file in wwwroot ...
     let files = Directory.GetFiles "wwwroot"
     let bucketObjects =
@@ -28,7 +42,7 @@ let infra () =
                              Bucket = io bucket.BucketName,
                              ContentType = input contentType,
                              Source = input (FileAsset file :> AssetOrArchive)),
-                         CustomResourceOptions (Parent = bucket)))
+                         CustomResourceOptions (Parent = bucket, DependsOn = inputList [input ownershipControls; input publicAccessBlock])))
 
     // Export the name of the bucket
     let endpoint = bucket.WebsiteEndpoint.Apply (sprintf "http://%s")

diff --git a/aws-fs-s3-folder/aws-cs-s3-folder.fsproj b/aws-fs-s3-folder/aws-cs-s3-folder.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>