Merge branch 'develop'

GuyWaguespack · GuyWaguespack · commit ed2d95d3412c · 2025-02-24T14:45:44.000-06:00
diff --git a/Zephyr.Directory.Aws/Ldap.cs b/Zephyr.Directory.Aws/Ldap.cs
@@ -16,6 +16,9 @@
 using Newtonsoft.Json.Linq;
 
 using Zephyr.Directory.Ldap;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
 
 // Allows Lambda Function's JSON Input to be converted into a .NET class
 [assembly: LambdaSerializer(typeof(Amazon.Lambda.Serialization.Json.JsonSerializer))]
@@ -45,6 +48,7 @@ public static string parse_data(LdapObject data,List<string> headers){
             
             return csv_string;
         }
+
         public static dynamic OutputConverter(LdapResponse response, OutputType? type){
             dynamic OutputObject = null;
             if(type == OutputType.Json){
@@ -70,6 +74,19 @@ public static dynamic OutputConverter(LdapResponse response, OutputType? type){
             }
             return OutputObject;
         }
+
+        public static string GetServerIPAddress()
+        {
+            string localIP;
+            using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, 0))
+            {
+                socket.Connect("8.8.8.8", 80);
+                IPEndPoint endpoint = socket.LocalEndPoint as IPEndPoint;
+                localIP = endpoint.Address.ToString();
+            }
+            return localIP;
+        }
+
         public static dynamic ProcessRequest(LdapRequest request, ILambdaContext ctx)
         {   
             bool isPing = request.Ping.HasValue;
@@ -106,8 +123,10 @@ public static dynamic ProcessRequest(LdapRequest request, ILambdaContext ctx)
                     System.Diagnostics.FileVersionInfo fvi = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location);
                     string version = fvi.FileVersion;
                     response.Message = "Hello From MyriAD (" + version + ").";
+                    response.Server = GetServerIPAddress();
                     if (request.Ping == PingType.Echo)
                         Console.WriteLine("Ping");
+                    output_data = response;
                 }
                 else
                 {
diff --git a/Zephyr.Directory.Aws/Properties/AssemblyInfo.cs b/Zephyr.Directory.Aws/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.1.24219.0")]
-[assembly: AssemblyFileVersion("1.1.24219.0")]
+[assembly: AssemblyVersion("1.1.25055.0")]
+[assembly: AssemblyFileVersion("1.1.25055.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Zephyr.Directory.Aws/cf-templates/cft-myriad-core-apigateway-only.yaml b/Zephyr.Directory.Aws/cf-templates/cft-myriad-core-apigateway-only.yaml
@@ -235,7 +235,7 @@ Resources:
 Outputs:
   Version:
     Description: Cloud Formation Template Version
-    Value: 1.1.24150.0
+    Value: 1.1.25055.0
 
   StackName:
     Description: The name of this stack.
diff --git a/Zephyr.Directory.Aws/cf-templates/cft-myriad-core-lambda-only.yaml b/Zephyr.Directory.Aws/cf-templates/cft-myriad-core-lambda-only.yaml
@@ -97,7 +97,7 @@ Resources:
 Outputs:
   Version:
     Description: Cloud Formation Template Version
-    Value: 1.1.24150.0
+    Value: 1.1.25055.0
 
   StackName:
     Description: The name of this stack.
diff --git a/Zephyr.Directory.Aws/cf-templates/cft-myriad-core.yaml b/Zephyr.Directory.Aws/cf-templates/cft-myriad-core.yaml
@@ -316,7 +316,7 @@ Resources:
 Outputs:
   Version:
     Description: Cloud Formation Template Version
-    Value: 1.1.24150.0
+    Value: 1.1.25055.0
 
   StackName:
     Description: The name of this stack.
diff --git a/Zephyr.Directory.Aws/cf-templates/cft-myriad-init.yaml b/Zephyr.Directory.Aws/cf-templates/cft-myriad-init.yaml
@@ -110,7 +110,7 @@ Resources:
 Outputs:
   Version:
     Description: Cloud Formation Template Version
-    Value: 1.1.24150.0
+    Value: 1.1.25055.0
 
   StackName:
     Description: The name of this stack.
diff --git a/Zephyr.Directory.Aws/cf-templates/cft_Net_core.yaml b/Zephyr.Directory.Aws/cf-templates/cft_Net_core.yaml
@@ -403,7 +403,7 @@ Resources:
 Outputs:
   Version:
     Description: Cloud Formation Template Version
-    Value: 1.1.24150.0
+    Value: 1.1.25055.0
 
   StackName:
     Description: The name of this stack.
diff --git a/Zephyr.Directory.Aws/cf-templates/cft_Net_init.yaml b/Zephyr.Directory.Aws/cf-templates/cft_Net_init.yaml
@@ -223,7 +223,7 @@ Resources:
 Outputs:
   Version:
     Description: Cloud Formation Template Version
-    Value: 1.1.24150.0
+    Value: 1.1.25055.0
 
   StackName:
     Description: The name of this stack.
diff --git a/Zephyr.Directory.Ldap/LdapServer.cs b/Zephyr.Directory.Ldap/LdapServer.cs
@@ -496,7 +496,10 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search
                             if(Token_present){
                                continue_token = $"-0{Pick_up_Here}";
                                 PossibleNextToken = String.Concat((currentRecords+nextToken_client).ToString(), continue_token); 
+                            } else {
+                                PossibleNextToken = null;   // Search Is Complete.
                             }
+                            
                         }
                     }
                     for(int index =0; index < results.Count; index++){
diff --git a/Zephyr.Directory.Ldap/Zephyr.Directory.Ldap.csproj b/Zephyr.Directory.Ldap/Zephyr.Directory.Ldap.csproj
@@ -3,6 +3,10 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Configurations>Release;Debug</Configurations>
+    <PackageId>Zephyr.Directory.Ldap</PackageId>
+    <Version>1.1.25049.0</Version>
+    <Authors>Guy Waguespack</Authors>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
diff --git a/Zephyr.Directory.Test/Program.cs b/Zephyr.Directory.Test/Program.cs
@@ -24,6 +24,8 @@
 using System.Linq.Expressions;
 using YamlDotNet.Serialization;
 using Newtonsoft.Json.Linq;
+using System.Net;
+using System.Net.Sockets;
 
 namespace Zephyr.Directory
 {
@@ -51,6 +53,7 @@ public static string parse_data(LdapObject data,List<string> headers){
             
             return csv_string;
         }
+
         public static dynamic OutputConverter(LdapResponse response, OutputType? type){
             dynamic OutputObject = null;
             if(type == OutputType.Json){
@@ -76,6 +79,18 @@ public static dynamic OutputConverter(LdapResponse response, OutputType? type){
             }
             return OutputObject;
         }
+
+        public static string GetServerIPAddress()
+        {
+            string localIP;
+            using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, 0)) {
+                socket.Connect("8.8.8.8", 80);
+                IPEndPoint endpoint = socket.LocalEndPoint as IPEndPoint;
+                localIP = endpoint.Address.ToString();
+            }
+            return localIP;
+        }
+
         static void Main(string[] args)
         {
             string content = File.ReadAllText(@"../../../TestFiles/myriad.json");
@@ -115,8 +130,10 @@ static void Main(string[] args)
                     System.Diagnostics.FileVersionInfo fvi = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location);
                     string version = fvi.FileVersion;
                     response.Message = "Hello From MyriAD (" + version + ").";
+                    response.Server = GetServerIPAddress();
                     if (request.Ping == PingType.Echo)
                         Console.WriteLine("Ping");
+                    output_data = response;
                 }
                 else
                 {
diff --git a/Zephyr.Directory.Test/Properties/AssemblyInfo.cs b/Zephyr.Directory.Test/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.1.24150.0")]
-[assembly: AssemblyFileVersion("1.1.24150.0")]
+[assembly: AssemblyVersion("1.1.25055.0")]
+[assembly: AssemblyFileVersion("1.1.25055.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Zephyr.Directory.Test/TestFiles/myriad.json b/Zephyr.Directory.Test/TestFiles/myriad.json
@@ -1,6 +1 @@
-{
-  "jobID": "123456-c846-41a5-bdbb-989557298571",
-  "config": {
-    "retrieval": true
-  }
-}
+{ "ping": "Echo" }

Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,10 @@ public LdapResponse Search(LdapRequest request, string searchBase, string search`
`496`	`496`	`if(Token_present){`
`497`	`497`	`continue_token = $"-0{Pick_up_Here}";`
`498`	`498`	`PossibleNextToken = String.Concat((currentRecords+nextToken_client).ToString(), continue_token);`
	`499`	`+ } else {`
	`500`	`+ PossibleNextToken = null; // Search Is Complete.`
`499`	`501`	`}`
	`502`	`+`
`500`	`503`	`}`
`501`	`504`	`}`
`502`	`505`	`for(int index =0; index < results.Count; index++){`