train-pwsh 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39702d4eac70b2194a4c37b925bd3029169c874b0d649360c1b64509fa81c86e
-  data.tar.gz: 58248aeb93158177f68664d638660128fafd13f75d43d5439a5add22d4c3da5b
+  metadata.gz: 9c0b97bc0ab701a473da4c28af195434cfc6fc374103614bb00ea02766c7d28f
+  data.tar.gz: 86f25bad8916379f13ae5769dc0a0ee89d30b1798c679496903a3b8a874f015f
 SHA512:
-  metadata.gz: '0484eace9bfecbb42c78967bdd0aca9c3c75f32202fca17ac55342202652ee5fed32e45d6f2df19eb15360e978648acaa491c85574dedd9411bf576a6f7d4855'
-  data.tar.gz: bfcae4cdf0664ab10d3dbe819d4de61c9b067c25a7ff583afaa6184b313865f01492b6d272b791439adffb43e3ac18bcdfb869bbdaccd6dc40ebe61176bd97f5
+  metadata.gz: 1da78073262a500f458e9208d39850a778aa2b1993f8db53e2e8286bdb5850834e249124cee78b98a4be09b47cca338ad645f3b46fea2b45f8794b95e87672f1
+  data.tar.gz: e16e5aebad94903f7d7c7663eb5f41d9939029149f875fd1aa8af1fc1e2936cdd762440c47a8fe0632e362c2e69cf86f0f5f5e267d0504a2aa79ab336c12cfd0

data/lib/train-pwsh/connection.rb

@@ -55,6 +55,7 @@ module TrainPlugins
         #@pwsh_session_teams_pnp = @options.delete(:teams_pnp_session)
         @pwsh_session_graph_exchange = ::Pwsh::Manager.instance("#{@pwsh_path}", ['-NoLogo'])
         @pwsh_session_teams_pnp = ::Pwsh::Manager.instance("#{@pwsh_path}", [])
+        @pwsh_session_azure = ::Pwsh::Manager.instance("#{@pwsh_path}", ['-NoProfile'])
         @client_id = @options.delete(:client_id)
         @tenant_id = @options.delete(:tenant_id)
         @client_secret = @options.delete(:client_secret)
@@ -65,10 +66,13 @@ module TrainPlugins
         
         exit_status_graph_exchange = install_connect_graph_exchange()
         exit_status_teams_pnp = install_connect_teams_pnp()
+        exit_status_azure = install_azure()
         if exit_status_graph_exchange != 0
           return exit_status_graph_exchange
         elsif exit_status_teams_pnp != 0
           return exit_status_teams_pnp
+        elsif exit_status_azure != 0
+          return exit_status_azure
         end
         
       end
@@ -82,6 +86,8 @@ module TrainPlugins
           return run_script_in_graph_exchange(script)
         elsif session_type_hash.key?(:teams_pnp_session)
           return run_script_in_teams_pnp(script)
+        elsif session_type_hash.key?(:azure_session)
+          return run_script_in_azure(script)
         else
           return CommandResult.new("","",0)
         end
@@ -98,14 +104,14 @@ module TrainPlugins
           $organization = '#{@organization}'
 
           #Connect to Graph module
-          If($null -eq (get-module -listavailable -name "microsoft.graph")){install-module microsoft.graph}
+          If($null -eq (get-module -listavailable -name "microsoft.graph")){install-module microsoft.graph -Force -AllowClobber}
           If($null -eq (get-module -name "microsoft.graph")){import-module microsoft.graph}
           $password = ConvertTo-SecureString -String $clientSecret -AsPlainText -Force
           $ClientSecretCredential = New-Object -TypeName System.Management.Automation.PSCredential($client_id,$password)
           Connect-MgGraph -TenantId $tenantid -ClientSecretCredential $ClientSecretCredential -NoWelcome
 
           #Connect to Exchange module
-          If($null -eq (get-module -listavailable -name "ExchangeOnlineManagement")){install-module ExchangeOnlineManagement}
+          If($null -eq (get-module -listavailable -name "ExchangeOnlineManagement")){install-module ExchangeOnlineManagement -Force -AllowClobber}
           If($null -eq (get-module -name "ExchangeOnlineManagement")){import-module ExchangeOnlineManagement}
           $password = ConvertTo-SecureString -String $clientSecret -AsPlainText -Force
           $ClientSecretCredential = New-Object -TypeName System.Management.Automation.PSCredential($client_id,$password)
@@ -131,13 +137,13 @@ module TrainPlugins
           $sharepoint_admin_url = '#{@sharepoint_admin_url}'
 
           #Connect to Teams module
-          If($null -eq (get-module -listavailable -name "MicrosoftTeams")){install-module MicrosoftTeams}
+          If($null -eq (get-module -listavailable -name "MicrosoftTeams")){install-module MicrosoftTeams -Force -AllowClobber}
           If($null -eq (get-module -name "MicrosoftTeams")){import-module MicrosoftTeams}
           $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($certificate_path,$certificate_password)
           Connect-MicrosoftTeams -Certificate $cert -ApplicationId $client_id -TenantId $tenantid > $null
 
           #Connect to PnP module
-          If($null -eq (get-module -listavailable -name "PnP.PowerShell")){install-module PnP.PowerShell}
+          If($null -eq (get-module -listavailable -name "PnP.PowerShell")){install-module PnP.PowerShell -Force -AllowClobber}
           If($null -eq (get-module -name "PnP.PowerShell")){import-module PnP.PowerShell}
           $password = (ConvertTo-SecureString -AsPlainText $certificate_password -Force)
           Connect-PnPOnline -Url $sharepoint_admin_url -ClientId $client_id -CertificatePath $certificate_path -CertificatePassword $password -Tenant $tenantid
@@ -146,6 +152,24 @@ module TrainPlugins
         return pwsh_teams_pnp_install_connect_result[:exitcode]
       end
 
+      def install_azure()
+        pwsh_azure_install_connect = %{
+          #Collect designated inputs required for Graph, Exchange, and PnP connections
+          $client_id = '#{@client_id}'
+          $tenantid = '#{@tenant_id}'
+          $certificate_password = '#{@certificate_password}'
+          $certificate_path = '#{@certificate_path}'
+          $sharepoint_admin_url = '#{@sharepoint_admin_url}'
+
+          #Connect to Teams module
+          If ($null -eq (Get-Module -ListAvailable -Name "Az")) {Install-Module Az -Force -AllowClobber}
+          If ($null -eq (Get-Module -Name "Az")) {Import-Module Az}
+          Connect-AzAccount
+        }
+        pwsh_azure_install_connect_result = @pwsh_session_azure.execute(pwsh_azure_install_connect)
+        return pwsh_azure_install_connect_result[:exitcode]
+      end
+
       def run_script_in_graph_exchange(script)
         result = @pwsh_session_graph_exchange.execute(script)
         if result[:stdout].nil?
@@ -171,6 +195,19 @@ module TrainPlugins
         end
         return CommandResult.new(result[:stdout],result[:stderr],result[:exitcode])
       end
+
+      def run_script_in_azure(script)
+        result = @pwsh_session_azure.execute(script)
+        if result[:stdout].nil?
+          result[:stdout] = ""
+        end
+        if !result[:stdout].empty? && result[:stdout].match?(/is not recognized|session is not established/i)
+          result[:stderr] = result[:stdout]
+          result[:stdout] = ""
+          result[:exitcode] = -1
+        end
+        return CommandResult.new(result[:stdout],result[:stderr],result[:exitcode])
+      end
     end
   end
 end

data/lib/train-pwsh/version.rb

@@ -2,6 +2,6 @@
 
 module Train
   module Pwsh
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-pwsh
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Sujay Kandwal
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-26 00:00:00.000000000 Z
+date: 2025-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train