Merge remote-tracking branch 'origin/peer-v4.3.1' into peer-v7.8.0

Conflicts:
	modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellExperimentalClientCodegen.java
	modules/openapi-generator/src/main/resources/powershell-experimental/api.mustache
	modules/openapi-generator/src/main/resources/powershell/utils.mustache

Author: ppritchard-peer

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java

@@ -770,6 +770,7 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("Out-DebugParameter.mustache", infrastructureFolder + File.separator + "Private" + File.separator, "Out-DebugParameter.ps1"));
         supportingFiles.add(new SupportingFile("http_signature_auth.mustache", infrastructureFolder + "Private", apiNamePrefix + "HttpSignatureAuth.ps1"));
         supportingFiles.add(new SupportingFile("rsa_provider.mustache", infrastructureFolder + "Private", apiNamePrefix + "RSAEncryptionProvider.cs"));
+        supportingFiles.add(new SupportingFile("utils.mustache", infrastructureFolder + "Private" + File.separator, "utils.ps1"));
 
 
         // en-US

modules/openapi-generator/src/main/resources/powershell/api.mustache

@@ -223,7 +223,8 @@ function {{{vendorExtensions.x-powershell-method-name}}} {
         {{/isApiKey}}
         {{#isBasicBasic}}
         if ($Configuration["Username"] -and $Configuration["Password"]) {
-            $LocalVarBytes = [System.Text.Encoding]::UTF8.GetBytes($Configuration["Username"] + ":" + $Configuration["Password"])
+            $Password = Get-PlainTextPassword -Password $Configuration["Password"]
+            $LocalVarBytes = [System.Text.Encoding]::UTF8.GetBytes($Configuration["Username"] + ":" + $Password)
             $LocalVarBase64Text =[Convert]::ToBase64String($LocalVarBytes)
             $LocalVarHeaderParameters['Authorization'] = "Basic " + $LocalVarBase64Text
             Write-Verbose ("Using HTTP basic authentication in {0}" -f $MyInvocation.MyCommand)

modules/openapi-generator/src/main/resources/powershell/configuration.mustache

@@ -75,6 +75,9 @@ Username in HTTP basic authentication
 .PARAMETER Password
 Password in HTTP basic authentication
 
+.PARAMETER SecurePassword
+Password in HTTP basic authentication, in secure string format
+
 .PARAMETER ApiKey
 API Keys for authentication/authorization
 
@@ -115,6 +118,7 @@ function Set-{{{apiNamePrefix}}}Configuration {
         [string]$Username,
         [AllowEmptyString()]
         [string]$Password,
+        [securestring]$SecurePassword,
         [hashtable]$ApiKey,
         [hashtable]$ApiKeyPrefix,
         [AllowEmptyString()]
@@ -143,7 +147,11 @@ function Set-{{{apiNamePrefix}}}Configuration {
         }
 
         If ($Password) {
-            $Script:Configuration['Password'] = $Password
+            $Script:Configuration['Password'] = ConvertTo-SecureString -String $Password -AsPlainText -Force
+        }
+
+        If ($SecurePassword) {
+            $Script:Configuration['Password'] = $SecurePassword
         }
 
         If ($ApiKey) {

modules/openapi-generator/src/main/resources/powershell/utils.mustache

@@ -0,0 +1,34 @@
+{{> partial_header}}
+<#
+.SYNOPSIS
+A wrapper function that extracts the password from a SecureString as plain text.
+
+.DESCRIPTION
+A wrapper function that extracts the password from a SecureString as plain text.
+For PowerShell Core the function calls the ConvertFrom-SecureString cmdlet directly.
+For PowerShell 5.1 the System.Runtime.InteropServices.Marshal type is used to extract
+the password from the SecureString as plain text.
+
+.PARAMETER Password
+Specifies the SecureString Password from which the plain text password should be extracted.
+#>
+function Get-PlainTextPassword {
+    [CmdletBinding()]
+    [OutputType([string])]
+    param (
+        [Parameter(Mandatory = $true)]
+        [SecureString]
+        $Password
+    )
+
+    $plainTextPassword = $null
+
+    if ($Global:PSVersionTable.PSEdition -eq 'Core') {
+        $plainTextPassword = ConvertFrom-SecureString -SecureString $Password -AsPlainText
+    } else {
+        $passwordAsBinaryString = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($Password)
+        $plainTextPassword = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($passwordAsBinaryString)
+    }
+
+    $plainTextPassword
+}

peer_update_version.py

@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+
+"""Set the version based on the current git branch/SHA."""
+
+import os
+import re
+import subprocess
+
+
+def run_cmmd_capture_stdout(command):
+    """Run a command and capture its stdout."""
+    process = subprocess.run(command, check=False, capture_output=True, text=True)
+    return process.stdout.rstrip('\n')
+
+
+def get_branch():
+    """Get the git branch."""
+    return run_cmmd_capture_stdout(['git', 'rev-parse', '--abbrev-ref', '@'])
+
+
+def get_sha():
+    """Get the git SHA."""
+    return run_cmmd_capture_stdout(['git', 'rev-parse', '--short=10', '@'])
+
+
+def update_version(file_path, branch, sha):
+    """Update version information in a pom.xml file."""
+    encoding = 'utf-8'
+
+    with open(file_path, 'r', encoding=encoding) as file:
+        filedata = file.read()
+
+    filedata = re.sub(
+        # Find the version between RELEASE_VERSION tags and append the branch and SHA to it
+        r'(?P<start><!-- RELEASE_VERSION -->\s*\n' +
+        r'\s*<version>)' +
+        r'(?P<version>[\d.]*)(?P<version_suffix>(-SNAPSHOT)?).*(?P<end>'
+        r'</version>\s*\n' +
+        r'\s*<!-- /RELEASE_VERSION -->)',
+        r'\g<start>\g<version>\g<version_suffix>-' + branch + r'-' + sha + r'\g<end>', filedata)
+
+    with open(file_path, 'w', encoding=encoding) as file:
+        file.write(filedata)
+
+
+def update_poms():
+    """Set the version in necessary pom.xml files to tag the openapi generator build."""
+    branch = get_branch()
+    sha = get_sha()
+    files = [
+        os.path.join('modules', 'openapi-generator-cli', 'pom.xml'),
+        os.path.join('modules', 'openapi-generator-core', 'pom.xml'),
+        os.path.join('modules', 'openapi-generator-gradle-plugin', 'pom.xml'),
+        os.path.join('modules', 'openapi-generator-maven-plugin', 'pom.xml'),
+        os.path.join('modules', 'openapi-generator-online', 'pom.xml'),
+        os.path.join('modules', 'openapi-generator', 'pom.xml'),
+        'pom.xml'
+    ]
+
+    for file in files:
+        update_version(file, branch, sha)
+
+
+if __name__ == '__main__':
+    update_poms()

samples/client/petstore/powershell/src/PSPetstore/Client/PSConfiguration.ps1

@@ -81,6 +81,9 @@ Username in HTTP basic authentication
 .PARAMETER Password
 Password in HTTP basic authentication
 
+.PARAMETER SecurePassword
+Password in HTTP basic authentication, in secure string format
+
 .PARAMETER ApiKey
 API Keys for authentication/authorization
 
@@ -121,6 +124,7 @@ function Set-PSConfiguration {
         [string]$Username,
         [AllowEmptyString()]
         [string]$Password,
+        [securestring]$SecurePassword,
         [hashtable]$ApiKey,
         [hashtable]$ApiKeyPrefix,
         [AllowEmptyString()]
@@ -149,7 +153,11 @@ function Set-PSConfiguration {
         }
 
         If ($Password) {
-            $Script:Configuration['Password'] = $Password
+            $Script:Configuration['Password'] = ConvertTo-SecureString -String $Password -AsPlainText -Force
+        }
+
+        If ($SecurePassword) {
+            $Script:Configuration['Password'] = $SecurePassword
         }
 
         If ($ApiKey) {