Fix minio client setup in integration test

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

src/InformaticsGateway/appsettings.Test.json

@@ -11,14 +11,14 @@
     },
     "messaging": {
       "publisherSettings": {
-        "endpoint": "172.18.0.4",
+        "endpoint": "172.28.0.1",
         "username": "rabbitmq",
         "password": "rabbitmq",
         "virtualHost": "monaideploy",
         "exchange": "monaideploy"
       },
       "subscriberSettings": {
-        "endpoint": "172.18.0.4",
+        "endpoint": "172.28.0.1",
         "username": "rabbitmq",
         "password": "rabbitmq",
         "virtualHost": "monaideploy",
@@ -31,7 +31,7 @@
       "bucketName": "monai",
       "temporaryBucketName": "monai",
       "settings": {
-        "endpoint": "172.18.0.2:9000",
+        "endpoint": "172.28.0.1:9000",
         "accessKey": "minioadmin",
         "accessToken": "minioadmin",
         "securedConnection": false,
@@ -59,4 +59,4 @@
       }
     }
   }
-}
+}

tests/Integration.Test/StepDefinitions/AcrApiStepDefinitions.cs

@@ -193,7 +193,8 @@ public async Task ThenAStudyIsUploadedToTheStorageService()
         {
             var minioClient = new MinioClient()
                 .WithEndpoint(_configuration.StorageServiceOptions.Endpoint)
-                .WithCredentials(_configuration.StorageServiceOptions.AccessKey, _configuration.StorageServiceOptions.AccessToken);
+                .WithCredentials(_configuration.StorageServiceOptions.AccessKey, _configuration.StorageServiceOptions.AccessToken)
+                .Build();
 
             var dicomSizes = _scenarioContext[KeyDicomHashes] as Dictionary<string, string>;
             _rabbitMqHooks.MessageWaitHandle.Wait(MessageWaitTimeSpan).Should().BeTrue();

tests/Integration.Test/StepDefinitions/ExportServicesStepDefinitions.cs

@@ -118,7 +118,8 @@ public async Task GivenDICOMInstances(int studyCount, string modality)
 
             var minioClient = new MinioClient()
                 .WithEndpoint(_configuration.StorageServiceOptions.Endpoint)
-                .WithCredentials(_configuration.StorageServiceOptions.AccessKey, _configuration.StorageServiceOptions.AccessToken);
+                .WithCredentials(_configuration.StorageServiceOptions.AccessKey, _configuration.StorageServiceOptions.AccessToken)
+                .Build();
 
             _outputHelper.WriteLine($"Uploading {fileSpecs.FileCount} files to MinIO...");
             foreach (var file in fileSpecs.Files)

tests/Integration.Test/StepDefinitions/FhirDefinitions.cs

@@ -116,7 +116,8 @@ public async Task ThenFhirResourcesAreUploadedToStorageService()
 
             var minioClient = new MinioClient()
                 .WithEndpoint(_configuration.StorageServiceOptions.Endpoint)
-                .WithCredentials(_configuration.StorageServiceOptions.AccessKey, _configuration.StorageServiceOptions.AccessToken);
+                .WithCredentials(_configuration.StorageServiceOptions.AccessKey, _configuration.StorageServiceOptions.AccessToken)
+                .Build();
 
             foreach (var message in messages)
             {

tests/Integration.Test/StepDefinitions/HealthLevel7Definitions.cs

@@ -193,7 +193,8 @@ public async Task ThenMessageAreUploadedToStorageService()
 
             var minioClient = new MinioClient()
                 .WithEndpoint(_configuration.StorageServiceOptions.Endpoint)
-                .WithCredentials(_configuration.StorageServiceOptions.AccessKey, _configuration.StorageServiceOptions.AccessToken);
+                .WithCredentials(_configuration.StorageServiceOptions.AccessKey, _configuration.StorageServiceOptions.AccessToken)
+                .Build();
 
             var listOjbectsArgs = new ListObjectsArgs()
                     .WithBucket(request.Bucket)

tests/Integration.Test/StepDefinitions/SharedDefinitions.cs

@@ -109,7 +109,8 @@ public async Task ThenXXFilesUploadedToStorageService()
         {
             var minioClient = new MinioClient()
                 .WithEndpoint(_configuration.StorageServiceOptions.Endpoint)
-                .WithCredentials(_configuration.StorageServiceOptions.AccessKey, _configuration.StorageServiceOptions.AccessToken);
+                .WithCredentials(_configuration.StorageServiceOptions.AccessKey, _configuration.StorageServiceOptions.AccessToken)
+                .Build();
 
             var dicomSizes = _scenarioContext[KeyDicomHashes] as Dictionary<string, string>;
             _rabbitMqHooks.MessageWaitHandle.Wait(MessageWaitTimeSpan).Should().BeTrue();

tests/Integration.Test/debug.sh

@@ -15,7 +15,6 @@
 
 
 # enable(1)/disable(0) VS code attach debuger
-export VSTEST_HOST_DEBUG=0
 
 export SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 TEST_DIR="$SCRIPT_DIR/"
@@ -91,9 +90,9 @@ function start_services() {
     docker network inspect testrunner
     info "============================================="
 
-    info "Stopping Informatics Gateway for debugging..."
-    ig_contianer=$(docker container ls --format 'table {{.Names}}\t{{.ID}}' | grep integrationtest-informatics-gateway | awk '{print $2}')
-    docker kill $ig_contianer
+    # info "Stopping Informatics Gateway for debugging..."
+    # ig_contianer=$(docker container ls --format 'table {{.Names}}\t{{.ID}}' | grep integrationtest-informatics-gateway | awk '{print $2}')
+    # docker kill $ig_contianer
 
     sleep 1
     sudo chown -R $USER:$USER $RUN_DIR
@@ -114,7 +113,12 @@ function main() {
     env_setup "$@"
     build
     start_services
-    docker compose logs -f
+    # docker compose logs -f
+
+    echo execute the following:
+    echo "   export HOST_IP=$HOST_IP"
+    echo "   export VSTEST_HOST_DEBUG=1"
+    echo "   dotnet test --filter XYZ"
 }
 
 main "$@"