KCLnet AWS credentials role change and dependabot auto-merge fix

.github/dependabot.yml

@@ -4,3 +4,11 @@ updates:
     directory: "/"
     schedule: 
       interval: "weekly"
+
+  - package-ecosystem: "maven"
+    directory: "/"
+    open-pull-requests-limit: 4
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: 'awssdk.*'

.github/workflows/dotnet.yml

@@ -12,10 +12,12 @@ on:
 permissions:
   id-token: write
   contents: write
+  pull-requests: write
+  statuses: write
 
 jobs:
   sample-run:
-    timeout-minutes: 8
+    timeout-minutes: 9
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -30,6 +32,8 @@ jobs:
     steps:
       - name: Checkout working directory
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -51,8 +55,7 @@ jobs:
 
       - name: Restore, Build, and Test
         run: |
-          dotnet restore
-          dotnet build --no-restore
+          dotnet build
           dotnet test --no-build
 
       - name: Install AWS SDK into projects
@@ -83,17 +86,25 @@ jobs:
   auto-merge-dependabot:
     needs: [sample-run]
     runs-on: ubuntu-latest
-    if: github.event.pull_request.user.login == 'dependabot[bot]'
+    if: github.actor == 'dependabot[bot]' && github.event.pull_request.user.login == 'dependabot[bot]'
     steps:
       - name: Fetch Dependabot metadata
         id: metadata
         uses: dependabot/fetch-metadata@v2
         with:
           alert-lookup: true
           github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Enable auto-merge for Dependabot PRs
+
+      - name: Approve PR
         if: steps.metadata.outputs.update-type != 'version-update:semver-major'
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr review --approve "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+#      - name: Enable auto-merge for Dependabot PRs
+#        if: steps.metadata.outputs.update-type != 'version-update:semver-major'
+#        run: gh pr merge --auto --merge "$PR_URL"
+#        env:
+#          PR_URL: ${{github.event.pull_request.html_url}}
+#          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

Bootstrap/Bootstrap.cs

@@ -10,6 +10,8 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Xml.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
 using CommandLine;
 
 namespace Amazon.Kinesis.ClientLibrary.Bootstrap
@@ -61,12 +63,23 @@
             }
 
             String destination = Path.Combine(folder, FileName);
-            if (!File.Exists(destination))
-            {
-                var client = new WebClient();
-                client.Headers.Add("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; .NET CLR 1.0.3705;)");
-                Console.Error.WriteLine(Url + " --> " + destination);
-                client.DownloadFile(new Uri(Url), destination);
+            if (!File.Exists(destination)) {
+                using var client = new HttpClient();
+                client.DefaultRequestHeaders.Add("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; .NET CLR 1.0.3705;)");
+
+                    try {
+                        Console.Error.WriteLine(Url + " --> " + destination);
+                        using var response = client.GetAsync(new Uri(Url)).GetAwaiter().GetResult();
+                        response.EnsureSuccessStatusCode();
+
+                        using var fs = new FileStream(destination, FileMode.Create);
+                        response.Content.CopyToAsync(fs).GetAwaiter().GetResult();
+                        return;
+                    }
+                    catch (HttpRequestException ex)
+                    {
+                        throw new Exception($"Failed to download {FileName}: {ex.Message}", ex);
+                    }
             }
         }
 
@@ -83,7 +96,7 @@
                 urlParts.Add(ArtifactId);
                 urlParts.Add(Version);
                 urlParts.Add(FileName);
-                return "https://search.maven.org/remotecontent?filepath=" + String.Join("/", urlParts);
+                return "https://repo1.maven.org/maven2/" + String.Join("/", urlParts);
             }
         }
     }
@@ -204,7 +217,7 @@
 
             Process proc = new Process
             {
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = java,
                     Arguments = "-version",
@@ -219,6 +232,8 @@
             }
             catch (Exception ex)
             {
+                Console.WriteLine($"Error finding Java: {ex.Message}");
+                return null;
             }
             //TODO find away to read from registery on different OSs
             // Failing that, look in the registry.
@@ -238,8 +253,7 @@
             //        }
             //    }
             //}
-
-            return null;
+            //return null;
         }
 
         public static void Main(string[] args)

ClientLibrary/ClientLibrary.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>netcoreapp6.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>