Merge branch 'master' into ConnectTo-StorageGRID

This reverts commit db0fa1cf4a.

.changelog.yml

@@ -0,0 +1,32 @@
+# The full repository name
+repo: OCram85/PSCredentialStore
+
+# Service type (gitea or github)
+service: gitea
+
+# Base URL for Gitea instance if using gitea service type (optional)
+# Default: https://gitea.com
+base-url: https://gitea.ocram85.com
+
+# Changelog groups and which labeled PRs to add to each group
+groups:
+  - name: ✨ FEATURES
+    labels:
+      - feature
+  - name: 📦 META
+    labels:
+      - meta
+  - name: 🐛 BUGFIXES
+    labels:
+      - bug
+  - name: 🛠️ ENHANCEMENTS
+    labels:
+      - enhancement
+  - name: 📚 DOCS
+    labels:
+      - docs
+  - name: 🔖 MISC
+    default: true
+
+# regex indicating which labels to skip for the changelog
+skip-labels: skip-changelog|backport\/.+

.drone.yml

@@ -120,7 +120,7 @@ steps:
           Install-Module -Name 'DroneHelper' -Repository 'PSGallery' -ErrorAction 'Stop' -AllowPrerelease -Force;
           Import-Module -Name 'DroneHelper' -ErrorAction 'Stop';
           Install-ModuleDependency;
-          New-BuildPackage -Verbose
+          New-BuildPackage -Verbose -AdditionalPath @('./src/Vendor', './src/openssl.conf')
         }"
 
   - name: GiteaRelease

.gitattributes

@@ -21,4 +21,5 @@
 
 # Vendor resources config
 src/Vendor/libressl255/* filter=lfs diff=lfs merge=lfs -text
+src/Vendor/libressl/* filter=lfs diff=lfs merge=lfs -text
 *.pfx filter=lfs diff=lfs merge=lfs -text

CHANGELOG.md

@@ -1,9 +1,25 @@
 # Changelog
 
 <!-- insertMark -->
+## [v1.1.1](https://gitea.ocram85.com/OCram85/PSCredentialStore/releases/tag/v1.1.1) - 2022-10-10
+
+* 📦 META
+  * Adds changelog config for gitea changelog cli tool (#77)
+* 🐛 BUGFIXES
+  * Fix Set-CredentialStoreItem (#76)
+  * Fix optional module dependencies (#75)
+
+### Contributors
+
+
+* [@OCram85](https://gitea.ocram85.com/OCram85)
+* [@pinguinfuss](https://gitea.ocram85.com/pinguinfuss)
+
 ## `v1.1.0`
 
-- (acb09ba) update Changelog
+- (3d4f53d) adds pinguinfuss contributed fix (#73)
+- (6fce8d6) Updates libressl files (#71)
+- (ddb85d9) addChangelog (#70)
 - (5bdb383) updates Readme (#69)
 - (a95ba31) remove optional depenency helper (#68)
 - (1e7dd78) adds CiscoUCSCentral connection type (#67)
@@ -20,7 +36,6 @@
 - (4abfec5) adds PR template (#55)
 - (7708df9) Update pwsh style to latest community standards (#52)
 
-
 ## `v1.0.542`
 
 - 🧙 pre migrated Gitea version

src/Certificate/New-CSCertificate.ps1

@@ -66,7 +66,7 @@ function New-CSCertificate {
             ($PSVersionTable.PSEdition -eq 'Desktop' -and $PSVersionTable.PSVersion.Major -lt 6) -or
             ($IsWindows -eq $true)
         ) {
-            $openssl = Join-Path -Path $ModuleBase -ChildPath '/Vendor/libressl255/openssl.exe'
+            $openssl = Join-Path -Path $ModuleBase -ChildPath '/Vendor/libressl/openssl.exe'
         }
 
         $Env:OPENSSL_CONF = Join-Path $ModuleBase -ChildPath '/openssl.conf'

src/Connection/Connect-To.ps1

@@ -10,7 +10,7 @@ function Connect-To {
         Specify the host, for which you would like to change the credentials.
 
     .PARAMETER Identifier
-        Defaults to "". Specify a string, which separates two CredentialStoreItems for the
+        Defaults to ''. Specify a string, which separates two CredentialStoreItems for the
         same hostname.
 
     .PARAMETER Type
@@ -18,13 +18,14 @@ function Connect-To {
 
         - CiscoUcs
         - CiscoUcsCentral
-        - CisServer
         - ExchangeHTTP
         - ExchangeHTTPS
         - FTP
         - NetAppFAS
+        - NetAppStorageGRID
         - SCP
         - VMware
+        - VMwareCisServer
 
     .PARAMETER Credentials
         Use this parameter to bypass the stored credentials. Without this parameter Connect-To tries to read the
@@ -48,79 +49,86 @@ function Connect-To {
         [None]
 
     .EXAMPLE
-        Connect-To -RemoteHost "ucs.myside.local" -Type CiscoUcs
+        Connect-To -RemoteHost 'vc.domain.local' -Type CisServer
 
     .EXAMPLE
-       Connect-To -RemoteHost "ucscentral.myside.local" -Type 'CiscoUcsCentral'
+        Connect-To -RemoteHost 'ucs.domain.local' -Type CiscoUcs
 
     .EXAMPLE
-        Connect-To -RemoteHost "ftp.myside.local" -Type FTP
+        Connect-To -RemoteHost 'ucs-central.domain.local' -Type 'CiscoUcsCentral'
 
     .EXAMPLE
-        Connect-To -RemoteHost "fas.myside.local" -Type NetAppFAS
+        Connect-To -RemoteHost 'exchange01.domain.local' -Type ExchangeHTTP
 
     .EXAMPLE
-        Connect-To -RemoteHost "esx01.myside.local" -Type VMware
+        Connect-To -RemoteHost 'exchange01.domain.local' -Type ExchangeHTTPS
 
     .EXAMPLE
-        Connect-To -RemoteHost "vCenter.myside.local" -Type CisServer
+        Connect-To -RemoteHost 'ftp.domain.local' -Type FTP
 
     .EXAMPLE
-        Connect-To -RemoteHost "exchange01.myside.local" -Type ExchangeHTTP
+        Connect-To -RemoteHost 'fas.domain.local' -Type NetAppFAS
 
     .EXAMPLE
-        Connect-To -RemoteHost "exchange01.myside.local" -Type ExchangeHTTPS
+        Connect-To -RemoteHost 'grid.domain.local' -Type NetAppStorageGRID
+
+    .EXAMPLE
+        Connect-To -RemoteHost 'esx01.domain.local' -Type VMware
+
     #>
 
     [CmdletBinding(DefaultParameterSetName = 'Private')]
+
     [Diagnostics.CodeAnalysis.SuppressMessageAttribute(
         'PSAvoidGlobalVars',
         '',
         Justification = 'Wrapping existing var from WinSCP module.'
     )]
+
     param (
         [Parameter(Mandatory = $true, ParameterSetName = 'Shared')]
         [Parameter(Mandatory = $true, ParameterSetName = 'Private')]
-        [string]$RemoteHost,
+        [string] $RemoteHost,
 
         [Parameter(Mandatory = $false, ParameterSetName = 'Shared')]
         [Parameter(Mandatory = $false, ParameterSetName = 'Private')]
-        [string]$Identifier,
+        [string] $Identifier,
 
         [Parameter(Mandatory = $true, ParameterSetName = 'Shared')]
         [Parameter(Mandatory = $true, ParameterSetName = 'Private')]
         [ValidateSet(
             'CiscoUcs',
             'CiscoUcsCentral',
-            'FTP',
-            'NetAppFAS',
-            'VMware',
-            'CisServer',
             'ExchangeHTTP',
             'ExchangeHTTPS',
-            'SCP'
+            'FTP',
+            'NetAppFAS',
+            'NetAppStorageGRID',
+            'SCP',
+            'VMware',
+            'VMwareCisServer'
         )]
-        [string]$Type,
+        [string] $Type,
 
         [Parameter(Mandatory = $False, ParameterSetName = 'Shared')]
         [Parameter(Mandatory = $False, ParameterSetName = 'Private')]
-        [PSCredential]$Credentials,
+        [PSCredential] $Credentials,
 
         [Parameter(Mandatory = $true, ParameterSetNAme = 'Shared')]
-        [switch]$Shared,
+        [switch] $Shared,
 
         [Parameter(Mandatory = $False, ParameterSetName = 'Shared')]
         [ValidateNotNullOrEmpty()]
-        [string]$Path,
+        [string] $Path,
 
         [Parameter(Mandatory = $False, ParameterSetName = 'Private')]
         [Parameter(Mandatory = $False, ParameterSetName = 'Shared')]
-        [switch]$PassThru
+        [switch] $PassThru
     )
 
     begin {
         # Set the CredentialStore for private, shared or custom mode.
-        Write-Debug ("ParameterSetName: {0}" -f $PSCmdlet.ParameterSetName)
+        Write-Debug ('ParameterSetName: {0}' -f $PSCmdlet.ParameterSetName)
         if ($PSCmdlet.ParameterSetName -eq 'Private') {
             $Path = Get-DefaultCredentialStorePath
         }
@@ -131,7 +139,7 @@ function Connect-To {
         }
 
         switch ($Type) {
-            "VMware" {
+            'VMware' {
                 # Disable the yellow certificate warning, since we haven't replaced the SSL certs for vCenter/ESXi
                 $null = Set-PowerCLIConfiguration -Scope Session -InvalidCertificateAction Ignore -Confirm:$false
 
@@ -139,6 +147,11 @@ function Connect-To {
                 $null = Set-PowerCLIConfiguration -Scope Session -ProxyPolicy NoProxy -Confirm:$false
             }
         }
+
+        # Set sane defaults for Progress, ErrorAction and InformationPreference
+        $ProgressPreference = 'SilentlyContinue'
+        $ErrorActionPreference = 'Stop'
+        $InformationPreference = 'Continue'
     }
 
     process {
@@ -149,8 +162,8 @@ function Connect-To {
             # Check if $Identifier has been defined, in which case we need to use different name for
             # the lookup of the CredentialStoreItem.
             try {
-                if ($Identifier -ne "") {
+                if ($Identifier -ne '') {
-                    $RemoteHostIdentifier = "{0}/{1}" -f $Identifier, $RemoteHost
+                    $RemoteHostIdentifier = '{0}/{1}' -f $Identifier, $RemoteHost
                     $creds = Get-CredentialStoreItem -Shared -RemoteHost $RemoteHostIdentifier -Path $Path
                 }
                 else {
@@ -161,8 +174,8 @@ function Connect-To {
             catch {
                 $MessageParams = @{
                     Message     = (
-                        "Unable to look up credential store item for RemoteHost " +
+                        'Unable to look up credential store item for RemoteHost ' +
-                        ("{0}/Identifier {1}!" -f $RemoteHost, $Identifier)
+                        ('{0}/Identifier {1}!' -f $RemoteHost, $Identifier)
                     )
                     ErrorAction = 'Stop'
                 }
@@ -173,44 +186,70 @@ function Connect-To {
             $creds = $Credentials
         }
 
-        if ($creds.UserName -eq "" -or $creds.Password.GetType().Name -ne 'SecureString') {
+        if ($creds.UserName -eq '' -or $creds.Password.GetType().Name -ne 'SecureString') {
             $MessageParams = @{
-                Message     = "Please provide valid credentials for RemoteHost {0}!" -f $RemoteHost
+                Message     = 'Please provide valid credentials for RemoteHost {0}!' -f $RemoteHost
                 ErrorAction = 'Stop'
             }
             Write-Error @MessageParams
         }
         else {
             switch ($Type) {
-                "CiscoUcs" {
+                'CiscoUcs' {
                     try {
-                        $handle = Connect-Ucs -Name $RemoteHost -Credential $creds -ErrorAction 'Stop' -NotDefault
+                        $handle = Connect-Ucs -Name $RemoteHost -Credential $creds -NotDefault
                         $ExecutionContext.SessionState.PSVariable.Set('DefaultUcs', $handle)
                     }
 
                     catch {
-                        $MessageParams = @{
+                        Write-Error -Message ('Unable to connect to {0} using Type {1}.' -f $RemoteHost, $Type)
-                            Message     = "Unable to connect to {0} using Type {1}." -f $RemoteHost, $Type
-                            ErrorAction = 'Stop'
-                        }
-                        Write-Error @MessageParams
                     }
                 }
-                "CiscoUcsCentral" {
+
+                'CiscoUcsCentral' {
                     try {
                         $handle = Connect-UcsCentral -Name $RemoteHost -Credential $creds -NotDefault
                         $ExecutionContext.SessionState.PSVariable.Set('DefaultUcsCentral', $handle)
                     }
 
                     catch {
-                        $MessageParams = @{
+                        Write-Error -Message ('Unable to connect to {0} using {1}' -f $RemoteHost, $Type)
-                            Message     = ('Unable to connect to {0} using {1}' -f $RemoteHost, $Type)
-                            ErrorAction = 'Stop'
-                        }
-                        Write-Error @MessageParams
                     }
                 }
-                "FTP" {
+
+                'ExchangeHTTP' {
+                    try {
+                        $ConnectionParams = @{
+                            ConnectionURI     = 'http://{0}/powershell' -f $RemoteHost
+                            ConfigurationName = 'Microsoft.Exchange'
+                            Credential        = $creds
+                        }
+                        $global:PSExchangeRemote = New-PSSession @ConnectionParams
+                        # ScriptAnalyzer issue (unused var) workaround.
+                        $null = $global:PSExchangeRemote
+                    }
+                    catch {
+                        # Write a error message to the log.
+                        Write-Error -Message ('Unable to connect to {0} using Type {1}.' -f $RemoteHost, $Type)
+                    }
+                }
+
+                'ExchangeHTTPS' {
+                    try {
+                        $ConnectionParams = @{
+                            ConnectionURI     = 'https://{0}/powershell' -f $RemoteHost
+                            ConfigurationName = 'Microsoft.Exchange'
+                            Credential        = $creds
+                        }
+                        $global:PSExchangeRemote = New-PSSession @ConnectionParams
+                    }
+                    catch {
+                        # Write a error message to the log.
+                        Write-Error -Message ('Unable to connect to {0} using Type {1}.' -f $RemoteHost, $Type)
+                    }
+                }
+
+                'FTP' {
                     # First establish the FTP session
                     $WinSCPConParams = @{
                         Credential = $creds
@@ -218,115 +257,81 @@ function Connect-To {
                         Protocol   = 'Ftp'
                         FtpMode    = 'Passive'
                     }
+
                     try {
                         $FTPSessionOption = New-WinSCPSessionOption @WinSCPConParams
-                        $Global:WinSCPSession = New-WinSCPSession -SessionOption $FTPSessionOption
+                        $global:WinSCPSession = New-WinSCPSession -SessionOption $FTPSessionOption
                     }
                     catch {
-                        throw "Could not connect to {0} using {1} protocol!" -f $RemoteHost, $Type
+                        Write-Error -Message ('Could not connect to {0} using {1} protocol!' -f $RemoteHost, $Type)
                     }
+
                     # Check the Connection State
-                    if (!($WinSCPSession.Opened)) {
+                    if (-not $WinSCPSession.Opened) {
                         # Check the connection state and find out if the session is still open.
-                        $MessageParams = @{
+                        $m = 'Connection to {0} using Type {1} was established. ' -f $RemoteHost, $Type
-                            Message     = (
+                        $m += 'But now it seems to be lost!'
-                                ("Connection to {0} using Type {1} " -f $RemoteHost, $Type) +
+                        Write-Error -Message $m
-                                "was established. But now it seems to be lost!"
-                            )
-                            ErrorAction = 'Stop'
-                        }
-                        Write-Error @MessageParams
                     }
                 }
-                "NetAppFAS" {
+
+                'NetAppFAS' {
+                    # Construct the splatting for Connect-NcController
+                    $params = @{
+                        Name       = $RemoteHost
+                        Credential = $creds
+                        HTTPS      = $true
+                    }
+
+                    # Check if -PassThru was passed. If so, a) do not set the default variable and b) return the
+                    # session object to the caller.
+                    if ($PSBoundParameters.ContainsKey('PassThru')) {
+                        $params.Add('Transient', $true)
+                    }
+
                     try {
-                        $null = Connect-NcController -Name $RemoteHost -Credential $creds -ErrorAction Stop -HTTPS
+                        $handle = Connect-NcController @params
                     }
 
                     catch {
                         # Write a error message to the log.
-                        $MessageParams = @{
+                        Write-Error -Message ('Unable to connect to {0} using Type {1}.' -f $RemoteHost, $Type)
-                            Message     = "Unable to connect to {0} using Type {1}." -f $RemoteHost, $Type
+                    }
-                            ErrorAction = 'Stop'
+
-                        }
+                    if ($PSBoundParameters.ContainsKey('PassThru')) {
-                        Write-Error @MessageParams
+                        return $handle
                     }
                 }
-                "VMware" {
+
+                'NetAppStorageGRID' {
+                    # Construct the splatting for Connect-SgwServer
+                    $params = @{
+                        Name                 = $RemoteHost
+                        Credential           = $creds
+                        SkipCertificateCheck = $true
+                    }
+
+                    # Check if -PassThru was passed. If so, a) do not set the default variable and b) return the
+                    # session object to the caller.
+                    if ($PSBoundParameters.ContainsKey('PassThru')) {
+                        $params.Add('Transient', $true)
+                    }
+
                     try {
-                        Connect-VIServer -Server $RemoteHost -Credential $creds -ErrorAction Stop | Out-Null
+                        $SgwSession = Connect-SgwServer @params
                     }
 
                     catch {
                         # Write a error message to the log.
-                        $MessageParams = @{
+                        Write-Error -Message ('Unable to connect to {0} using Type {1}.' -f $RemoteHost, $Type)
-                            Message     = "Unable to connect to {0} using Type {1}." -f $RemoteHost, $Type
-                            ErrorAction = 'Stop'
-                        }
-                        Write-Error @MessageParams
-                    }
-                }
-                "CisServer" {
-                    try {
-                        if ($PassThru.IsPresent) {
-                            Connect-CisServer -Server $RemoteHost -Credential $creds -ErrorAction Stop
-                        }
-                        else {
-                            Connect-CisServer -Server $RemoteHost -Credential $creds -ErrorAction Stop | Out-Null
-                        }
-
                     }
 
-                    catch {
+                    if ($PSBoundParameters.ContainsKey('PassThru')) {
-                        # Write a error message to the log.
+                        return $SgwSession
-                        $MessageParams = @{
-                            Message     = "Unable to connect to {0} using Type {1}." -f $RemoteHost, $Type
-                            ErrorAction = 'Stop'
-                        }
-                        Write-Error @MessageParams
                     }
                 }
-                "ExchangeHTTP" {
+
-                    try {
+                'SCP' {
-                        $ConnectionParams = @{
-                            ConnectionURI     = "http://{0}/powershell" -f $RemoteHost
-                            ConfigurationName = 'Microsoft.Exchange'
-                            Credential        = $creds
-                            ErrorAction       = 'Stop'
-                        }
-                        $Global:PSExchangeRemote = New-PSSession @ConnectionParams
-                        # ScriptAnalyzer issue (unused var) workaround.
-                        $null = $Global:PSExchangeRemote
-                    }
-                    catch {
-                        # Write a error message to the log.
-                        $MessageParams = @{
-                            Message     = "Unable to connect to {0} using Type {1}." -f $RemoteHost, $Type
-                            ErrorAction = 'Stop'
-                        }
-                        Write-Error @MessageParams
-                    }
-                }
-                "ExchangeHTTPS" {
-                    try {
-                        $ConnectionParams = @{
-                            ConnectionURI     = "https://{0}/powershell" -f $RemoteHost
-                            ConfigurationName = 'Microsoft.Exchange'
-                            Credential        = $creds
-                            ErrorAction       = 'Stop'
-                        }
-                        $Global:PSExchangeRemote = New-PSSession @ConnectionParams
-                    }
-                    catch {
-                        # Write a error message to the log.
-                        $MessageParams = @{
-                            Message     = "Unable to connect to {0} using Type {1}." -f $RemoteHost, $Type
-                            ErrorAction = 'Stop'
-                        }
-                        Write-Error @MessageParams
-                    }
-                }
-                "SCP" {
                     $WinSCPSessionParams = @{
                         Credential                           = $creds
                         Hostname                             = $RemoteHost
@@ -335,39 +340,49 @@ function Connect-To {
                     }
                     try {
                         $SessionOption = New-WinSCPSessionOption @WinSCPSessionParams
-                        $Global:WinSCPSession = New-WinSCPSession -SessionOption $SessionOption
+                        $global:WinSCPSession = New-WinSCPSession -SessionOption $SessionOption
                         Write-Verbose -Message (
-                            "SCP Connection established with {0}" -f $Global:WinSCPSession.Hostname
+                            'SCP Connection established with {0}' -f $global:WinSCPSession.Hostname
                         )
                     }
                     catch {
                         # Write a error message to the log.
-                        $MessageParams = @{
+                        Write-Error -Message ('Unable to connect to {0} using Type {1}.' -f $RemoteHost, $Type)
-                            Message     = "Unable to connect to {0} using Type {1}." -f $RemoteHost, $Type
-                            ErrorAction = 'Stop'
-                        }
-                        Write-Error @MessageParams
                     }
                     # Check the Connection State
                     if (!($WinSCPSession.Opened)) {
                         # Check the connection state and find out if the session is still open.
-                        $MessageParams = @{
+                        $m = 'Connection to {0} using Type {1} was established. ' -f $RemoteHost, $Type
-                            Message     = (
+                        $m += 'But now it seems to be lost!'
-                                ("Connection to {0} using Type {1} was established. " -f $RemoteHost, $Type) +
+                        Write-Error -Message $m
-                                "But now it seems to be lost!"
-                            )
-                            ErrorAction = 'Stop'
-                        }
-                        Write-Error @MessageParams
                     }
                 }
-                default {
+
-                    # Write a error message to the log.
+                'VMware' {
-                    $MessageParams = @{
+                    try {
-                        Message     = "Unable to connect to {0} using Type {1}." -f $RemoteHost, $Type
+                        Connect-VIServer -Server $RemoteHost -Credential $creds -ErrorAction Stop | Out-Null
-                        ErrorAction = 'Stop'
+                    }
+
+                    catch {
+                        # Write a error message to the log.
+                        Write-Error -Message ('Unable to connect to {0} using Type {1}.' -f $RemoteHost, $Type)
+                    }
+                }
+
+                'VMwareCisServer' {
+                    try {
+                        if ($PassThru.IsPresent) {
+                            Connect-CisServer -Server $RemoteHost -Credential $creds
+                        }
+                        else {
+                            $null = Connect-CisServer -Server $RemoteHost -Credential $creds
+                        }
+                    }
+
+                    catch {
+                        # Write a error message to the log.
+                        Write-Error -Message ('Unable to connect to {0} using Type {1}.' -f $RemoteHost, $Type)
                     }
-                    Write-Error @MessageParams
                 }
             }
         }

src/Connection/Disconnect-From.ps1

@@ -1,30 +1,26 @@
 function Disconnect-From {
     <#
     .SYNOPSIS
-        Terminates a session established with Connect-To using a CredentialStoreItem.
+        Terminates a session established with Connect-To.
 
     .DESCRIPTION
-        Terminates a session established with Connect-To using a CredentialStoreItem.
+        Terminates a session established with Connect-To.
 
     .PARAMETER RemoteHost
         Specify the remote endpoint, whose session you would like to terminate.
 
-    .PARAMETER Identifier
-        Defaults to "". Specify a string, which separates two CredentialStoreItems for the
-        same hostname.
-
     .PARAMETER Type
         Specify the host type of the target. Currently implemented targets are:
-
         - CiscoUcs
         - CiscoUcsCentral
-        - FTP
-        - NetAppFAS
-        - VMware
-        - CisServer
         - ExchangeHTTP
         - ExchangeHTTPS
+        - FTP
+        - NetAppFAS
+        - NetAppStorageGRID
         - SCP
+        - VMware
+        - VMwareCisServer
 
     .PARAMETER Force
         Force the disconnect, even if the disconnect would fail.
@@ -36,197 +32,194 @@ function Disconnect-From {
         [None]
 
     .EXAMPLE
-        Disconnect-From -RemoteHost "ucs.myside.local" -Type CiscoUcs
+        Disconnect-From -RemoteHost 'vc.domain.local' -Type CisServer
 
     .EXAMPLE
-        Disconnect-From -RemoteHost "ftp.myside.local" -Type FTP
+        Disconnect-From -RemoteHost 'ucs.domain.local' -Type CiscoUcs
 
     .EXAMPLE
-        Disconnect-From -RemoteHost "fas.myside.local" -Type NetAppFAS
+        Disconnect-From -RemoteHost 'ucs-central.domain.local' -Type 'CiscoUcsCentral'
 
     .EXAMPLE
-        Disconnect-From -RemoteHost "esx01.myside.local" -Type VMware
+        Disconnect-From -RemoteHost 'exchange01.domain.local' -Type ExchangeHTTP
 
     .EXAMPLE
-        Disconnect-From -RemoteHost "esx01.myside.local" -Type VMware -Force:$True
+        Disconnect-From -RemoteHost 'exchange01.domain.local' -Type ExchangeHTTPS
 
     .EXAMPLE
-        Disconnect-From -RemoteHost "vcenter.myside.local" -Type CisServer
+        Disconnect-From -RemoteHost 'ftp.domain.local' -Type FTP
 
     .EXAMPLE
-        Disconnect-From -RemoteHost "exchange01.myside.local" -Type ExchangeHTTP
+        Disconnect-From -RemoteHost 'fas.domain.local' -Type NetAppFAS
 
     .EXAMPLE
-        Disconnect-From -RemoteHost "exchange01.myside.local" -Type ExchangeHTTPS
+        Disconnect-From -RemoteHost 'grid.domain.local' -Type NetAppStorageGRID
+
+    .EXAMPLE
+        Disconnect-From -RemoteHost 'esx01.domain.local' -Type VMware
+
+    .EXAMPLE
+        Disconnect-From -RemoteHost 'esx01.domain.local' -Type VMware -Force:$True
+
     #>
 
     [CmdletBinding()]
+
     [Diagnostics.CodeAnalysis.SuppressMessageAttribute(
         'PSAvoidGlobalVars',
         '',
         Justification = 'Wrapping existing global vars from external modules'
     )]
+
     param (
         [Parameter(Mandatory = $true)]
-        [string]$RemoteHost,
+        [string] $RemoteHost,
 
         [Parameter(Mandatory = $true)]
         [ValidateSet(
             'CiscoUcs',
             'CiscoUcsCentral',
-            'FTP',
-            'NetAppFAS',
-            'VMware',
-            'CisServer',
             'ExchangeHTTP',
             'ExchangeHTTPS',
-            'SCP'
+            'FTP',
+            'NetAppFAS',
+            'NetAppStorageGRID',
+            'SCP',
+            'VMware',
+            'VMwareCisServer'
         )]
-        [string]$Type,
+        [string] $Type,
 
         [Parameter(Mandatory = $false)]
-        [switch]$Force
+        [switch] $Force
     )
 
-    begin {}
+    begin {
+        # Set sane defaults for Progress, ErrorAction and InformationPreference
+        $ProgressPreference = 'SilentlyContinue'
+        $ErrorActionPreference = 'Stop'
+        $InformationPreference = 'Continue'
+    }
 
     process {
         switch -Regex ($Type) {
-            "VMware" {
+            'CiscoUcs' {
                 try {
-                    if ($Force) {
+                    $null = Disconnect-Ucs -Ucs $RemoteHost
-                        Disconnect-VIServer -Server $RemoteHost -Confirm:$false -ErrorAction 'Stop' -Force:$true
-                    }
-                    else {
-                        Disconnect-VIServer -Server $RemoteHost -Confirm:$false -ErrorAction 'Stop'
-                    }
                 }
 
                 catch {
                     # Write a error message to the log.
-                    $MessageParams = @{
+                    Write-Error -Message ('Unable to disconnect from {0} using Type {1}.' -f $RemoteHost, $Type)
-                        Message     = "Unable to disconnect from {0} using Type {1}." -f $RemoteHost, $Type
-                        ErrorAction = 'Stop'
-                    }
-                    Write-Error @MessageParams
                 }
             }
-            "CisServer" {
-                try {
-                    if ($Force) {
-                        Disconnect-CisServer -Server $RemoteHost -Confirm:$false -ErrorAction 'Stop' -Force:$true
-                    }
-                    else {
-                        Disconnect-CisServer -Server $RemoteHost -Confirm:$false -ErrorAction 'Stop'
-                    }
-                }
 
+            'CiscoUCSCentral' {
+                try {
+                    $null = Disconnect-UcsCentral -Name $RemoteHost
+                    $ExecutionContext.SessionState.PSVariable.Set('DefaultUcsCentral', $null)
+                }
                 catch {
-                    # Write a error message to the log.
+                    Write-Error -Message ('Unable to disconnect from {0} using Type {1}.' -f $RemoteHost, $Type)
-                    $MessageParams = @{
-                        Message     = "Unable to disconnect from {0} using Type {1}." -f $RemoteHost, $Type
-                        ErrorAction = 'Stop'
-                    }
-                    Write-Error @MessageParams
                 }
             }
+
+            'ExchangeHTTP*' {
+                try {
+                    Get-Variable -Name 'PSExchangeRemote' -Scope 'Global'
+                    Remove-PSSession -Session $global:PSExchangeRemote
+                }
+                catch {
+                    Write-Error -Message ('Unable to disconnect from {0} using Type {1}.' -f $RemoteHost, $Type)
+                }
+            }
+
             # Check for an existing WinSCP Session var
-            "FTP" {
+            'FTP' {
-                if ($Global:WinSCPSession.Opened) {
+                if ($global:WinSCPSession.Opened) {
-                    Remove-WinSCPSession -WinSCPSession $Global:WinSCPSession
+                    Remove-WinSCPSession -WinSCPSession $global:WinSCPSession
                 }
                 else {
-                    $MessageParams = @{
+                    Write-Error -Message 'There is no open WinSCP Session'
-                        Message     = 'There is no open WinSCP Session'
-                        ErrorAction = 'Stop'
-                    }
-                    Write-Error @MessageParams
                 }
             }
+
             # DataONTAP doesn't have a CmdLet `Disconnect-NcController`.
             # So we go ahead and clear the CurrentNcController variable.
-            "NetAppFAS" {
+            'NetAppFAS' {
                 try {
-                    $MessageParams = @{
+                    $m = 'Setting {0} to $null, which will disconnect NetAppFAS' -f $global:CurrentNcController
-                        Message     = (
+                    Write-Verbose -Message $m
-                            "Setting {0} to `$null, which will disconnect NetAppFAS" -f $Global:CurrentNcController
+                    $global:CurrentNcController = $null
-                        )
-                        ErrorAction = 'Continue'
-                    }
-                    Write-Verbose @MessageParams
-                    $Global:CurrentNcController = $null
                 }
 
                 catch {
                     # Write a error message to the log.
-                    $MessageParams = @{
+                    Write-Error -Message ('Unable to disconnect from {0} using Type {1}.' -f $RemoteHost, $Type)
-                        Message     = "Unable to disconnect from {0} using Type {1}." -f $RemoteHost, $Type
-                        ErrorAction = 'Stop'
-                    }
-                    Write-Error @MessageParams
                 }
-
             }
-            "CiscoUcs" {
+
+            'NetAppSGWS' {
                 try {
-                    Disconnect-Ucs -Ucs $RemoteHost
+                    $null = Disconnect-SgwServer -Server $RemoteHost
+                    $null = Remove-Variable -Name CurrentSgwServer -Scope Global -ErrorAction 'SilentlyContinue'
                 }
 
                 catch {
                     # Write a error message to the log.
-                    $MessageParams = @{
+                    Write-Error -Message ('Unable to disconnect from {0} using Type {1}.' -f $RemoteHost, $Type)
-                        Message     = "Unable to disconnect from {0} using Type {1}." -f $RemoteHost, $Type
-                        ErrorAction = 'Stop'
-                    }
-                    Write-Error @MessageParams
-                }
-            }
-            "CiscoUCSCentral" {
-                try {
-                    $handle = Connect-UcsCentral -Name $RemoteHost -Credential $creds -NotDefault
-                    $ExecutionContext.SessionState.PSVariable.Set('DefaultUcsCentral', $handle)
-                }
-                catch {
-                    $MessageParams = @{
-                        Message     = "Unable to disconnect from {0} using Type {1}." -f $RemoteHost, $Type
-                        ErrorAction = 'Stop'
-                    }
-                    Write-Error @MessageParams
                 }
             }
 
-            "ExchangeHTTP*" {
+            'SCP' {
-                try {
+                if ($global:WinSCPSession.Opened) {
-                    Get-Variable -Name 'PSExchangeRemote' -Scope 'Global' -ErrorAction 'Stop'
+                    Remove-WinSCPSession -WinSCPSession $global:WinSCPSession
-                    Remove-PSSession -Session $Global:PSExchangeRemote -ErrorAction 'Stop'
-                }
-                catch {
-                    $MessageParams = @{
-                        Message     = "Unable to disconnect from {0} using Type {1}." -f $RemoteHost, $Type
-                        ErrorAction = 'Stop'
-                    }
-                    Write-Error @MessageParams
-                }
-            }
-            "SCP" {
-                if ($Global:WinSCPSession.Opened) {
-                    Remove-WinSCPSession -WinSCPSession $Global:WinSCPSession
                 }
                 else {
-                    $MessageParams = @{
+                    Write-Error -Message 'There is no open WinSCP Session'
-                        Message     = 'There is no open WinSCP Session'
-                        ErrorAction = 'Stop'
-                    }
-                    Write-Error @MessageParams
                 }
             }
+
+            'VMware' {
+                # Construct the splatting for Disconnect-VIServer
+                $params = @{
+                    Server  = $RemoteHost
+                    Confirm = $false
+                }
+
+                if ($PSBoundParameters.ContainsKey('Force')) {
+                    $params.Add('Force', $true)
+                }
+
+                try {
+                    $null = Disconnect-VIServer @params
+                }
+
+                catch {
+                    # Write a error message to the log.
+                    Write-Error -Message ('Unable to disconnect from {0} using Type {1}.' -f $RemoteHost, $Type)
+                }
+            }
+
+            'VMwareCisServer' {
+                try {
+                    if ($Force) {
+                        $null = Disconnect-CisServer -Server $RemoteHost -Confirm:$false -Force:$true
+                    }
+                    else {
+                        $null = Disconnect-CisServer -Server $RemoteHost -Confirm:$false
+                    }
+                }
+
+                catch {
+                    # Write a error message to the log.
+                    Write-Error -Message ('Unable to disconnect from {0} using Type {1}.' -f $RemoteHost, $Type)
+                }
+            }
+
             default {
                 # Write a error message to the log.
-                $MessageParams = @{
+                Write-Error -Message ('Unable to disconnect from {0} using Type {1}.' -f $RemoteHost, $Type)
-                    Message     = "Unable to disconnect from {0} using Type {1}." -f $RemoteHost, $Type
-                    ErrorAction = 'Stop'
-                }
-                Write-Error @MessageParams
             }
         }
     }

src/Item/New-CredentialStoreItem.Tests.ps1

@@ -102,7 +102,7 @@ Describe "New-CredentialStoreItem" {
         It "Missing CredentialStore should throw" {
             {
                 New-CredentialStoreItem -Shared -Path '/tmp/missingStore.json' -RemoteHost 'notrelevant'
-            } | Should -Throw "Could not add anything into the given CredentialStore."
+            } | Should -Throw "The given credential store (/tmp/missingStore.json) does not exist!"
         }
     }
     Context "Testing pipeline paramter" {

src/Item/New-CredentialStoreItem.ps1

@@ -1,168 +1,168 @@
-function New-CredentialStoreItem {
+function New-CredentialStoreItem {
-    <#
+    <#
-    .SYNOPSIS
+    .SYNOPSIS
-        Adds a credential store item containing host, user and password to the given store.
+        Adds a credential store item containing host, user and password to the given store.
-
+
-    .DESCRIPTION
+    .DESCRIPTION
-        The credentials are stored without any relations to it's further use. If you need to change an existing
+        The credentials are stored without any relations to it's further use. If you need to change an existing
-        item please use Set-CredentialStoreItem. You need to decide afterwards, whether to use the credential for
+        item please use Set-CredentialStoreItem. You need to decide afterwards, whether to use the credential for
-        a VIConnection, NetApp FAS or UCS Fabric Interconnect.
+        a VIConnection, NetApp FAS or UCS Fabric Interconnect.
-
+
-    .PARAMETER Path
+    .PARAMETER Path
-        Define the store in which you would like to add a new item.
+        Define the store in which you would like to add a new item.
-
+
-    .PARAMETER RemoteHost
+    .PARAMETER RemoteHost
-        The identifier or rather name for the given credentials.
+        The identifier or rather name for the given credentials.
-
+
-    .PARAMETER Identifier
+    .PARAMETER Identifier
-        Provide a custom identifier to the given remote host key. This enables you to store multiple credentials
+        Provide a custom identifier to the given remote host key. This enables you to store multiple credentials
-        for a single remote host entry. For example ad/sys1, ftp/sys1, mssql/sys1
+        for a single remote host entry. For example ad/sys1, ftp/sys1, mssql/sys1
-
+
-    .PARAMETER Credential
+    .PARAMETER Credential
-        You can provide credentials optionally as pre existing pscredential object.
+        You can provide credentials optionally as pre existing pscredential object.
-
+
-    .PARAMETER Shared
+    .PARAMETER Shared
-        Define the CredentialStore where you want to add the new item. Default is always personal but can be
+        Define the CredentialStore where you want to add the new item. Default is always personal but can be
-        changed to shared, or even shared with custom path.
+        changed to shared, or even shared with custom path.
-
+
-    .INPUTS
+    .INPUTS
-        [None]
+        [None]
-
+
-    .OUTPUTS
+    .OUTPUTS
-        [None]
+        [None]
-
+
-    .EXAMPLE
+    .EXAMPLE
-        New-CredentialStoreItem -Path 'C:\TMP\mystore.json' -RemoteHost 'esx01.myside.local'
+        New-CredentialStoreItem -Path 'C:\TMP\mystore.json' -RemoteHost esx01.myside.local'
-    #>
+    #>
-
+
-    [CmdletBinding(DefaultParameterSetName = 'Private')]
+    [CmdletBinding(DefaultParameterSetName = 'Private')]
-    [Diagnostics.CodeAnalysis.SuppressMessageAttribute(
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute(
-        'PSUseShouldProcessForStateChangingFunctions',
+        'PSUseShouldProcessForStateChangingFunctions',
-        '',
+        '',
-        Justification = 'Adds data into an existing object/file'
+        Justification = 'Adds data into an existing object/file'
-    )]
+    )]
-    param (
+    param (
-        [Parameter(Mandatory = $true, ParameterSetName = 'Shared')]
+        [Parameter(Mandatory = $true, ParameterSetName = 'Shared')]
-        [Parameter(Mandatory = $true, ParameterSetName = 'Private')]
+        [Parameter(Mandatory = $true, ParameterSetName = 'Private')]
-        [ValidateNotNullOrEmpty()]
+        [ValidateNotNullOrEmpty()]
-        [string]$RemoteHost,
+        [string]$RemoteHost,
-
+
-        [Parameter(Mandatory = $false, ParameterSetName = 'Shared')]
+        [Parameter(Mandatory = $false, ParameterSetName = 'Shared')]
-        [Parameter(Mandatory = $false, ParameterSetName = 'Private')]
+        [Parameter(Mandatory = $false, ParameterSetName = 'Private')]
-        [ValidateNotNullOrEmpty()]
+        [ValidateNotNullOrEmpty()]
-        [string]$Identifier,
+        [string]$Identifier,
-
+
-        [Parameter(Mandatory = $false, ValueFromPipeline = $true)]
+        [Parameter(Mandatory = $false, ValueFromPipeline = $true)]
-        [ValidateNotNullOrEmpty()]
+        [ValidateNotNullOrEmpty()]
-        [PSCredential]$Credential,
+        [PSCredential]$Credential,
-
+
-        [Parameter(Mandatory = $true, ParameterSetName = 'Shared')]
+        [Parameter(Mandatory = $true, ParameterSetName = 'Shared')]
-        [switch]$Shared,
+        [switch]$Shared,
-
+
-        [Parameter(Mandatory = $false, ParameterSetName = 'Shared')]
+        [Parameter(Mandatory = $false, ParameterSetName = 'Shared')]
-        [ValidateNotNullOrEmpty()]
+        [ValidateNotNullOrEmpty()]
-        [string]$Path
+        [string]$Path
-
+
-
+
-    )
+    )
-
+
-    begin {
+    begin {
-        # Set the CredentialStore for private, shared or custom mode.
+        # Set the CredentialStore for private, shared or custom mode.
-        Write-Debug ('ParameterSetName: {0}' -f $PSCmdlet.ParameterSetName)
+        Write-Debug ('ParameterSetName: {0}' -f $PSCmdlet.ParameterSetName)
-        if ($PSCmdlet.ParameterSetName -eq 'Private') {
+        if ($PSCmdlet.ParameterSetName -eq 'Private') {
-            $Path = Get-DefaultCredentialStorePath
+            $Path = Get-DefaultCredentialStorePath
-        }
+        }
-        elseif ($PSCmdlet.ParameterSetName -eq 'Shared') {
+        elseif ($PSCmdlet.ParameterSetName -eq 'Shared') {
-            if (!($PSBoundParameters.ContainsKey('Path'))) {
+            if (!($PSBoundParameters.ContainsKey('Path'))) {
-                $Path = Get-DefaultCredentialStorePath -Shared
+                $Path = Get-DefaultCredentialStorePath -Shared
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    process {
+    process {
-        # Lets do a quick test on the given CredentialStore.
+        # Lets do a quick test on the given CredentialStore.
-        if (-not(Test-CredentialStore -Shared -Path $Path)) {
+        if (-not(Test-CredentialStore -Shared -Path $Path)) {
-            $MessageParams = @{
+            $MessageParams = @{
-                Exception   = [System.IO.FileNotFoundException]::new(
+                Exception   = [System.IO.FileNotFoundException]::new(
-                    'The given credential store ({0}) does not exist!' -f $Path
+                    'The given credential store ({0}) does not exist!' -f $Path
-                )
+                )
-                ErrorAction = 'Stop'
+                ErrorAction = 'Stop'
-            }
+            }
-            Write-Error @MessageParams
+            Write-Error @MessageParams
-        }
+        }
-
+
-        $CSContent = Get-CredentialStore -Shared -Path $Path
+        $CSContent = Get-CredentialStore -Shared -Path $Path
-
+
-        $CurrentDate = Get-Date -Format 'u'
+        $CurrentDate = Get-Date -Format 'u'
-
+
-        if ($Identifier -ne '') {
+        if ($Identifier -ne '') {
-            $CredentialName = $RemoteHost = '{0}/{1}' -f $Identifier, $RemoteHost
+            $CredentialName = $RemoteHost = '{0}/{1}' -f $Identifier, $RemoteHost
-        }
+        }
-        else {
+        else {
-            $CredentialName = $RemoteHost
+            $CredentialName = $RemoteHost
-        }
+        }
-
+
-        if (-not($Credential)) {
+        if (-not($Credential)) {
-            $Credential = Get-Credential -Message $CredentialName
+            $Credential = Get-Credential -Message $CredentialName
-        }
+        }
-
+
-        if ($Credential.UserName) {
+        if ($Credential.UserName) {
-            if ($null -eq $CSContent.PfxCertificate) {
+            if ($null -eq $CSContent.PfxCertificate) {
-                $Cert = Get-CSCertificate -Type $CSContent.Type -Thumbprint $CSContent.Thumbprint
+                $Cert = Get-CSCertificate -Type $CSContent.Type -Thumbprint $CSContent.Thumbprint
-            }
+            }
-            else {
+            else {
-                $Cert = Get-PfxCertificate -FilePath $CSContent.PfxCertificate -ErrorAction Stop
+                $Cert = Get-PfxCertificate -FilePath $CSContent.PfxCertificate -ErrorAction Stop
-            }
+            }
-
+
-            if (Get-Member -InputObject $CSContent -Name $CredentialName -MemberType Properties) {
+            if (Get-Member -InputObject $CSContent -Name $CredentialName -MemberType Properties) {
-                $MessageParams = @{
+                $MessageParams = @{
-                    Message = 'The given host already exists. Nothing to do here.'
+                    Message = 'The given host already exists. Nothing to do here.'
-                }
+                }
-                Write-Warning @MessageParams
+                Write-Warning @MessageParams
-            }
+            }
-            else {
+            else {
-                $RSAKey = Get-RandomAESKey
+                $RSAKey = Get-RandomAESKey
-
+
-                $CredentialHash = [ordered]@{
+                $CredentialHash = [ordered]@{
-                    User         = $Credential.UserName
+                    User         = $Credential.UserName
-                    Password     = ConvertFrom-SecureString -SecureString $Credential.Password -Key $RSAKey
+                    Password     = ConvertFrom-SecureString -SecureString $Credential.Password -Key $RSAKey
-                    Created      = $CurrentDate
+                    Created      = $CurrentDate
-                    LastChange   = $null
+                    LastChange   = $null
-                    EncryptedKey = [Convert]::ToBase64String(
+                    EncryptedKey = [Convert]::ToBase64String(
-                        $Cert.PublicKey.Key.Encrypt(
+                        $Cert.PublicKey.Key.Encrypt(
-                            $RSAKey,
+                            $RSAKey,
-                            [System.Security.Cryptography.RSAEncryptionPadding]::Pkcs1
+                            [System.Security.Cryptography.RSAEncryptionPadding]::Pkcs1
-                        )
+                        )
-                    )
+                    )
-                }
+                }
-                $MemberParams = @{
+                $MemberParams = @{
-                    InputObject = $CSContent
+                    InputObject = $CSContent
-                    Name        = $CredentialName
+                    Name        = $CredentialName
-                    MemberType  = 'NoteProperty'
+                    MemberType  = 'NoteProperty'
-                    Value       = $CredentialHash
+                    Value       = $CredentialHash
-                }
+                }
-                Add-Member @MemberParams
+                Add-Member @MemberParams
-                try {
+                try {
-                    ConvertTo-Json -InputObject $CSContent | Out-File -FilePath $Path
+                    ConvertTo-Json -InputObject $CSContent | Out-File -FilePath $Path
-                }
+                }
-                catch {
+                catch {
-                    $MessageParams = @{
+                    $MessageParams = @{
-                        Message     = 'Could not add item into credential store!'
+                        Message     = 'Could not add item into credential store!'
-                        ErrorAction = 'Stop'
+                        ErrorAction = 'Stop'
-                    }
+                    }
-                    Write-Error @MessageParams
+                    Write-Error @MessageParams
-                }
+                }
-            }
+            }
-        }
+        }
-        else {
+        else {
-            $MessageParams = @{
+            $MessageParams = @{
-                Message     = 'Please Provide at least a valid user!'
+                Message     = 'Please Provide at least a valid user!'
-                ErrorAction = 'Stop'
+                ErrorAction = 'Stop'
-            }
+            }
-            Write-Error @MessageParams
+            Write-Error @MessageParams
-        }
+        }
-    }
+    }
-
+
-    end {}
+    end {}
-
+
-}
+}

src/Item/Set-CredentialStoreItem.Tests.ps1

@@ -0,0 +1,130 @@
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute(
+    'PSAvoidUsingConvertToSecureStringWithPlainText',
+    '',
+    Justification = 'just used in pester tests.'
+)]
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute(
+    'PSProvideCommentHelp',
+    '',
+    Justification = 'no need in internal pester helpers.'
+)]
+param ()
+
+BeforeAll {
+    $ManifestFile = (Get-Item -Path './src/*.psd1').FullName
+    Import-Module $ManifestFile -Force
+
+    $PrivateFunctions = (Get-ChildItem -Path './src/Private/*.ps1' | Where-Object {
+            $_.BaseName -notmatch '.Tests'
+        }
+    ).FullName
+    foreach ( $func in $PrivateFunctions) {
+        . $func
+    }
+
+    # Backup existing credential stores
+    $VerbosePreference = 'Continue'
+    Write-Verbose -Message 'Backup private Credential Store...'
+    $CSPath = Get-DefaultCredentialStorePath
+    $BackupFile = '{0}.back' -f $CSPath
+    if (Test-Path -Path $CSPath) {
+        Move-Item -Path $CSPath -Destination $BackupFile
+    }
+    Write-Verbose -Message 'Backup shared CredentialStore...'
+    $CSShared = Get-DefaultCredentialStorePath -Shared
+    $BackupSharedFile = '{0}.back' -f $CSShared
+    if (Test-Path -Path $CSShared) {
+        Move-Item -Path $CSShared -Destination $BackupSharedFile
+    }
+    Write-Verbose -Message 'Remove old CredentialStore in Temp dir'
+    $CSTemp = Join-Path -Path (Get-TempDir) -ChildPath '/CredentialStore.json'
+    if (Test-Path -Path $CSTemp) {
+        Remove-Item -Path $CSTemp
+    }
+    $VerbosePreference = 'SilentlyContinue'
+}
+
+Describe 'New-CredentialStoreItem' {
+    Context 'Private Credential Store tests' {
+        It 'Add entry to a private store.' {
+            # Create a fresh CredentialStore first
+            New-CredentialStore -Force
+
+            # Define the content of the CredentialStoreItem.
+            $RemoteHost = 'barfoo'
+            $UserName = 'MyUser'
+            $Password = 'fooobarysdfsfs' | ConvertTo-SecureString -AsPlainText -Force
+
+            # Form the CredentialObject.
+            $creds = [PSCredential]::new($UserName, $Password)
+
+            # Create the CredentialStoreItem.
+            New-CredentialStoreItem -RemoteHost $RemoteHost -Credential $creds
+
+            # Formulate an update to the CredentialStoreItem.
+            $ClearPassword = 'fooobaryadfafa'
+            $Password = $ClearPassword | ConvertTo-SecureString -AsPlainText -Force
+            $creds = [PSCredential]::new($UserName, $Password)
+            {
+                Set-CredentialStoreItem -RemoteHost $RemoteHost -Credential $creds
+            } | Should -Not -Throw
+
+            # Control the content of the CredentialStore.
+            $content = Get-CredentialStoreItem -RemoteHost $RemoteHost
+            $content.GetNetworkCredential().Password | Should -Be $ClearPassword
+        }
+    }
+    Context 'Shared Credential Store tests' {
+        It 'Add entry to a shared store.' {
+            # Create a fresh CredentialStore first
+            $tmpCS = Join-Path -Path (Get-TempDir) -ChildPath '/CredentialStore.json'
+            New-CredentialStore -Path $tmpCS -Force -Shared
+
+            # Define the content of the CredentialStoreItem.
+            $RemoteHost = 'barfoo'
+            $UserName = 'MyUser'
+            $Password = 'fooobarysdfsfs' | ConvertTo-SecureString -AsPlainText -Force
+
+            # Form the CredentialObject.
+            $creds = [PSCredential]::new($UserName, $Password)
+
+            # Create the CredentialStoreItem.
+            New-CredentialStoreItem -RemoteHost $RemoteHost -Credential $creds -Path $tmpCS -Shared
+
+            # Formulate an update to the CredentialStoreItem.
+            $ClearPassword = 'fooobaryadfafa'
+            $Password = $ClearPassword | ConvertTo-SecureString -AsPlainText -Force
+            $creds = [PSCredential]::new($UserName, $Password)
+
+            {
+                Set-CredentialStoreItem -RemoteHost $RemoteHost -Credential $creds -Path $tmpCS -Shared
+            } | Should -Not -Throw
+
+            # Control the content of the CredentialStore.
+            $content = Get-CredentialStoreItem -RemoteHost $RemoteHost -Path $tmpCS -Shared
+            $content.GetNetworkCredential().Password | Should -Be $ClearPassword
+        }
+    }
+}
+
+AfterAll {
+    # Cleanup test stores and restore existing ones.
+    $VerbosePreference = 'Continue'
+    Write-Verbose -Message 'Restoring private CredentialStore'
+    If (Test-Path -Path $BackupFile) {
+        If (Test-Path -Path $CSPath) {
+            Remove-Item -Path $CSPath
+            Move-Item -Path $BackupFile -Destination $CSPath
+        }
+    }
+
+    Write-Verbose -Message 'Restoring shared CredentialStore'
+    If (Test-Path -Path $BackupSharedFile) {
+        If (Test-Path -Path $CSShared) {
+            Remove-Item -Path $CSShared
+            Move-Item -Path $BackupSharedFile -Destination $CSShared
+        }
+    }
+    $VerbosePreference = 'SilentlyContinue'
+
+}

src/Item/Set-CredentialStoreItem.ps1

@@ -13,7 +13,7 @@ function Set-CredentialStoreItem {
         Specify the host you for which you would like to change the credentials.
 
     .PARAMETER Identifier
-        Defaults to "". Specify a string, which separates two CredentialStoreItems for the
+        Defaults to ''. Specify a string, which separates two CredentialStoreItems for the
         same hostname.
 
     .PARAMETER Shared
@@ -30,10 +30,10 @@ function Set-CredentialStoreItem {
         [None]
 
     .EXAMPLE
-        Set-CredentialStoreItem -Path "C:\TMP\mystore.json" -RemoteHost "esx01.myside.local"
+        Set-CredentialStoreItem -Path 'C:\TMP\mystore.json' -RemoteHost 'esx01.myside.local'
 
     .EXAMPLE
-        Set-CredentialStoreItem -Path "C:\TMP\mystore.json" -RemoteHost "esx01.myside.local" -Identifier svc
+        Set-CredentialStoreItem -Path 'C:\TMP\mystore.json' -RemoteHost 'esx01.myside.local' -Identifier svc
     #>
 
     [CmdletBinding(DefaultParameterSetName = 'Private')]
@@ -65,7 +65,7 @@ function Set-CredentialStoreItem {
 
     begin {
         # Set the CredentialStore for private, shared or custom mode.
-        Write-Debug ("ParameterSetName: {0}" -f $PSCmdlet.ParameterSetName)
+        Write-Debug ('ParameterSetName: {0}' -f $PSCmdlet.ParameterSetName)
         if ($PSCmdlet.ParameterSetName -eq 'Private') {
             $Path = Get-DefaultCredentialStorePath
         }
@@ -77,32 +77,52 @@ function Set-CredentialStoreItem {
     }
 
     process {
-        # Lets do a quick test on the given CredentialStore.
+        # Define the default splatting.
-        if (-not(Test-CredentialStore -Shared -Path $Path)) {
+        $DefaultSplatting = @{
+            Path = $Path
+        }
+
+        # Check if the user passed -Shared. If he added -Shared, we'll pass it into the splatting
+        if ($PSBoundParameters.ContainsKey('Shared')) {
+            $DefaultSplatting.Add('Shared', $true)
+        }
+        else {
+            $DefaultSplatting.Add('Shared', $false)
+        }
+
+        # Now lets check the given CredentialStore.
+        if (-not(Test-CredentialStore @DefaultSplatting)) {
             $MessageParams = @{
-                Message     = 'Could not add anything into the given CredentailStore.'
+                Message     = ('The given CredentialStore ({0}) does no exist.' -f $Path)
                 ErrorAction = 'Stop'
             }
             Write-Error @MessageParams
         }
 
         # Read the file content based on the given ParameterSetName
-        $CSContent = Get-CredentialStore -Shared -Path $Path
+        $CSContent = Get-CredentialStore @DefaultSplatting
 
+        # Get a formatted current date for the last update time of the Item.
         $CurrentDate = Get-Date -Format 'u'
 
-        if ($Identifier -ne "") {
+        # Check if the user supplied an identifier. If so, we need to mangle the CredentialName, as that's where
-            $CredentialName = $RemoteHost = "{0}/{1}" -f $Identifier, $RemoteHost
+        # the identifier is actually added.
+        if ($Identifier -ne '') {
+            $CredentialName = $RemoteHost = '{0}/{1}' -f $Identifier, $RemoteHost
         }
         else {
             $CredentialName = $RemoteHost
         }
 
+        # If the user didn't supply a CredentialObject, we need to prompt for it.
         if (-not($Credential)) {
             $Credential = Get-Credential -Message $CredentialName
         }
 
-        if ($Credential.UserName) {
+        # If the username isn't empty, we ca go ahead and update the entry.
+        if ($null -ne $Credential.UserName -and -not [string]::IsNullOrWhiteSpace($Credential.UserName)) {
+            # Check if the path to the PfxCertificate is stored in the CredentialStore. If so load the certificate.
+            # If not, load try loading the certificate from the Filepath of the CredentialStore.
             if ($null -eq $CSContent.PfxCertificate) {
                 $Cert = Get-CSCertificate -Type $CSContent.Type -Thumbprint $CSContent.Thumbprint
             }
@@ -110,13 +130,17 @@ function Set-CredentialStoreItem {
                 $Cert = Get-PfxCertificate -FilePath $CSContent.PfxCertificate -ErrorAction Stop
             }
 
+            # Now locate the Item.
             if (Get-Member -InputObject $CSContent -Name $CredentialName -MemberType Properties) {
+                # Get a random AES key for the entry.
                 $RSAKey = Get-RandomAESKey
                 $CSContent.$CredentialName.User = $Credential.UserName
                 $ConvertParams = @{
                     SecureString = $Credential.Password
                     Key          = $RSAKey
                 }
+
+                # Now create a updated item containing the updated credentials.
                 $CSContent.$CredentialName.Password = ConvertFrom-SecureString @ConvertParams
                 $CSContent.$CredentialName.LastChange = $CurrentDate
                 $CSContent.$CredentialName.EncryptedKey = [Convert]::ToBase64String(
@@ -125,10 +149,15 @@ function Set-CredentialStoreItem {
                         [System.Security.Cryptography.RSAEncryptionPadding]::Pkcs1
                     )
                 )
+
+                # Convert the CredentialStore back into JSON and save it to the file.
                 ConvertTo-Json -InputObject $CSContent -Depth 5 | Out-File -FilePath $Path -Encoding utf8
             }
+            else {
+                Write-Warning -Message ('Unable to locate CredentialStoreItem for {0}' -f $CredentialName)
+            }
         }
-        Else {
+        else {
             $MessageParams = @{
                 Message     = 'Please Provide at least a valid user!'
                 ErrorAction = 'Stop'

src/Item/Test-CredentialStoreItem.ps1

@@ -33,11 +33,11 @@ function Test-CredentialStoreItem {
         [None]
 
     .EXAMPLE
-        if (Test-CredentialStoreItem -RemoteHost "Default") {
+        if (Test-CredentialStoreItem -RemoteHost 'Default') {
-            Get-CredentialStoreItem -RemoteHost "Default"
+            Get-CredentialStoreItem -RemoteHost 'Default'
         }
         else {
-            Write-Warning ("The given Remote Host {0} does not exist in the credential Store!" -f $RemoteHost)
+            Write-Warning ('The given Remote Host {0} does not exist in the credential Store!' -f $RemoteHost)
         }
     #>
 
@@ -45,7 +45,7 @@ function Test-CredentialStoreItem {
     [OutputType([bool])]
     param (
         [Parameter(Mandatory = $false, ParameterSetName = 'Shared')]
-        [string]$Path = "{0}\PSCredentialStore\CredentialStore.json" -f $env:ProgramData,
+        [string]$Path = '{0}\PSCredentialStore\CredentialStore.json' -f $env:ProgramData,
 
         [Parameter(Mandatory = $true)]
         [ValidateNotNullOrEmpty()]
@@ -61,7 +61,7 @@ function Test-CredentialStoreItem {
 
     begin {
         # Set the CredentialStore for private, shared or custom mode.
-        Write-Debug ("ParameterSetName: {0}" -f $PSCmdlet.ParameterSetName)
+        Write-Debug ('ParameterSetName: {0}' -f $PSCmdlet.ParameterSetName)
         if ($PSCmdlet.ParameterSetName -eq 'Private') {
             $Path = Get-DefaultCredentialStorePath
         }
@@ -73,8 +73,8 @@ function Test-CredentialStoreItem {
     }
 
     process {
-        if ($Identifier -ne "") {
+        if ($Identifier -ne '') {
-            $CredentialName = $RemoteHost = "{0}/{1}" -f $Identifier, $RemoteHost
+            $CredentialName = $RemoteHost = '{0}/{1}' -f $Identifier, $RemoteHost
         }
         else {
             $CredentialName = $RemoteHost
@@ -92,7 +92,7 @@ function Test-CredentialStoreItem {
         }
         else {
             $MsgParams = @{
-                Message = "The given credential store ({0}) does not exist!" -f $Path
+                Message = 'The given credential store ({0}) does not exist!' -f $Path
             }
             Write-Warning @MsgParams
             return $false

src/PSCredentialStore.psd1

@@ -122,19 +122,19 @@
         PSData = @{
 
             # Tags applied to this module. These help with module discovery in online galleries.
-            Tags         = 'CredentialStore', 'CredentialManager'
+            Tags                       = 'CredentialStore', 'CredentialManager'
 
             # A URL to the license for this module.
-            LicenseUri   = 'https://gitea.ocram85.com/OCram85/PSCredentialStore/raw/branch/master/LICENSE'
+            LicenseUri                 = 'https://gitea.ocram85.com/OCram85/PSCredentialStore/raw/branch/master/LICENSE'
 
             # A URL to the main website for this project.
-            ProjectUri   = 'https://gitea.ocram85.com/OCram85/PSCredentialStore'
+            ProjectUri                 = 'https://gitea.ocram85.com/OCram85/PSCredentialStore'
 
             # A URL to an icon representing this module.
-            IconUri     = 'https://gitea.ocram85.com/OCram85/PSCredentialStore/raw/branch/master/assets/logo256.png'
+            IconUri                    = 'https://gitea.ocram85.com/OCram85/PSCredentialStore/raw/branch/master/assets/logo256.png'
 
             # ReleaseNotes of this module
-            ReleaseNotes = 'See https://gitea.ocram85.com/OCram85/PSCredentialStore/releases page for details.'
+            ReleaseNotes               = 'See https://gitea.ocram85.com/OCram85/PSCredentialStore/releases page for details.'
 
             # Prerelease string of this module
             #Prerelease   = 'preview'
@@ -145,28 +145,36 @@
             # External dependent modules of this module
             ExternalModuleDependencies = @(
                 @{
-                    ModuleName = 'VMware.VimAutomation.Core'
+                    ModuleName    = 'VMware.VimAutomation.Core'
                     ModuleVersion = '6.5.2.6234650'
                 },
                 @{
-                    ModuleName = 'VMware.VimAutomation.Cis.Core'
+                    ModuleName    = 'VMware.VimAutomation.Cis.Core'
                     ModuleVersion = '6.5.4.6983166'
                 },
                 @{
-                    ModuleName = 'Cisco.UCS.Core'
+                    ModuleName    = 'Cisco.UCS.Core'
                     ModuleVersion = '2.3.1.5'
                 },
                 @{
-                    ModuleName = 'Cisco.UCSManager'
+                    ModuleName    = 'Cisco.UCSManager'
                     ModuleVersion = '2.5.2.2'
                 },
                 @{
-                    ModuleName = 'WinSCP'
+                    ModuleName    = 'WinSCP'
                     ModuleVersion = '5.17.8.1'
                 },
                 @{
-                    ModuleName = 'DataONTAP'
+                    ModuleName    = 'NetApp.ONTAP'
-                    ModuleVersion = '9.7.1.1'
+                    ModuleVersion = '9.10.1.2111'
+                },
+                @{
+                    ModuleName    = 'StorageGRID-WebScale'
+                    ModuleVersion = '7.2.1'
+                },
+                @{
+                    ModuleName    = 'StorageGRID-WebScale'
+                    ModuleVersion = '7.2.1'
                 }
             )