From e3be24f8256c21be4525e8abae623695c8bb7fb2 Mon Sep 17 00:00:00 2001
From: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com>
Date: Fri, 8 Dec 2023 17:48:02 +0100
Subject: [PATCH] chore: Remove Sonar findings; update PR template (#1069)

---
 .github/pull_request_template.md                 | 4 ----
 Packages.props                                   | 1 -
 build.cake                                       | 2 +-
 src/Testcontainers.ActiveMq/Usings.cs            | 1 -
 src/Testcontainers.Couchbase/CouchbaseBuilder.cs | 2 +-
 src/Testcontainers.RabbitMq/Usings.cs            | 1 -
 src/Testcontainers.RavenDb/Usings.cs             | 1 -
 src/Testcontainers.SqlEdge/Usings.cs             | 1 -
 src/Testcontainers/Images/DockerImage.cs         | 3 +--
 9 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 64cad0ceb..0b7ed8626 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,3 @@
-<!-- Type of change
-Please label this PR with one of the existing labels, depending on the scope of your change.
--->
-
 ## What does this PR do?
 
 <!-- Mandatory
diff --git a/Packages.props b/Packages.props
index e70c2ddbd..6fa7083e5 100644
--- a/Packages.props
+++ b/Packages.props
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <ItemGroup>
-    <GlobalPackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" />
     <PackageReference Update="Docker.DotNet" Version="3.125.15" />
     <PackageReference Update="Docker.DotNet.X509" Version="3.125.15" />
     <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
diff --git a/build.cake b/build.cake
index 96798a516..bf3673349 100644
--- a/build.cake
+++ b/build.cake
@@ -1,4 +1,4 @@
-#tool nuget:?package=dotnet-sonarscanner&version=5.14.0
+#tool nuget:?package=dotnet-sonarscanner&version=5.15.0
 
 #addin nuget:?package=Cake.Sonar&version=1.1.32
 
diff --git a/src/Testcontainers.ActiveMq/Usings.cs b/src/Testcontainers.ActiveMq/Usings.cs
index 4ec1e3a96..c6ee33b57 100644
--- a/src/Testcontainers.ActiveMq/Usings.cs
+++ b/src/Testcontainers.ActiveMq/Usings.cs
@@ -1,5 +1,4 @@
 global using System;
-global using System.Threading.Tasks;
 global using Docker.DotNet.Models;
 global using DotNet.Testcontainers;
 global using DotNet.Testcontainers.Builders;
diff --git a/src/Testcontainers.Couchbase/CouchbaseBuilder.cs b/src/Testcontainers.Couchbase/CouchbaseBuilder.cs
index c89968f11..f8ae8eacc 100644
--- a/src/Testcontainers.Couchbase/CouchbaseBuilder.cs
+++ b/src/Testcontainers.Couchbase/CouchbaseBuilder.cs
@@ -580,7 +580,7 @@ await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken)
                 }
             }
 
-            throw new Exception($"Unable to configure Couchbase. The HTTP request '{request.RequestUri}' did not complete successfully.");
+            throw new HttpRequestException($"Unable to configure Couchbase. The HTTP request '{request.RequestUri}' did not complete successfully.");
         }
     }
 }
\ No newline at end of file
diff --git a/src/Testcontainers.RabbitMq/Usings.cs b/src/Testcontainers.RabbitMq/Usings.cs
index 4ec1e3a96..c6ee33b57 100644
--- a/src/Testcontainers.RabbitMq/Usings.cs
+++ b/src/Testcontainers.RabbitMq/Usings.cs
@@ -1,5 +1,4 @@
 global using System;
-global using System.Threading.Tasks;
 global using Docker.DotNet.Models;
 global using DotNet.Testcontainers;
 global using DotNet.Testcontainers.Builders;
diff --git a/src/Testcontainers.RavenDb/Usings.cs b/src/Testcontainers.RavenDb/Usings.cs
index d34337edf..bf2829a65 100644
--- a/src/Testcontainers.RavenDb/Usings.cs
+++ b/src/Testcontainers.RavenDb/Usings.cs
@@ -1,5 +1,4 @@
 global using System;
-global using System.Threading.Tasks;
 global using Docker.DotNet.Models;
 global using DotNet.Testcontainers.Builders;
 global using DotNet.Testcontainers.Configurations;
diff --git a/src/Testcontainers.SqlEdge/Usings.cs b/src/Testcontainers.SqlEdge/Usings.cs
index 6af8d6c7e..c42d82b9c 100644
--- a/src/Testcontainers.SqlEdge/Usings.cs
+++ b/src/Testcontainers.SqlEdge/Usings.cs
@@ -1,6 +1,5 @@
 global using System.Collections.Generic;
 global using System.Linq;
-global using System.Threading.Tasks;
 global using Docker.DotNet.Models;
 global using DotNet.Testcontainers;
 global using DotNet.Testcontainers.Builders;
diff --git a/src/Testcontainers/Images/DockerImage.cs b/src/Testcontainers/Images/DockerImage.cs
index d6203ceeb..671211af2 100644
--- a/src/Testcontainers/Images/DockerImage.cs
+++ b/src/Testcontainers/Images/DockerImage.cs
@@ -84,8 +84,7 @@ public DockerImage(
           .Where(imageComponent => !string.IsNullOrEmpty(imageComponent))
           .DefaultIfEmpty(string.Empty)
           .First()
-          .Split('/')
-          .First();
+          .Split('/')[0];
 
         if (firstSegmentOfRepository.IndexOfAny(new[] { '.', ':' }) >= 0)
         {