Merge branch 'main' of https://github.com/microsoft/go-sqlcmd into shueybubbles/hostnameincertificate

Author: David Shiflet (from Dev Box)

.gitignore

@@ -6,7 +6,7 @@
 *.dylib
 bin
 obj
-
+.vscode/*
 # Test binary, built with `go test -c`
 *.test
 

.pipelines/TestSql2017.yml

@@ -1,7 +1,4 @@
 variables:
-  # AZURE_CLIENT_SECRET and SQLPASSWORD must be defined as secret variables in the pipeline. 
-  # AZURE_TENANT_ID and AZURE_CLIENT_ID are not expected to be secret variables, just regular variables
-  AZURECLIENTSECRET: $(AZURE_CLIENT_SECRET)
   PASSWORD: $(SQLPASSWORD)
 pool:
    vmImage: 'ubuntu-latest'
@@ -21,34 +18,33 @@ steps:
       SQLCMDUSER: sa
       SQLPASSWORD: $(PASSWORD)
 
-  # The use of client secrets is disallowed now, so commenting out the Azure tests until we can switch to a federated credential.
-  # - template: include-runtests-linux.yml
-  #   parameters:
-  #     RunName: 'SQLDB'
-  #     # AZURESERVER must be defined as a variable in the pipeline
-  #     SQLCMDSERVER: $(AZURESERVER)
-  #     AZURECLIENTSECRET: $(AZURECLIENTSECRET)
-      
-  - task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
-    displayName: Merge coverage data
+  - task: AzureCLI@2
     inputs:
-      reports: '**/*.coverage.xml"' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
-      targetdir: 'coverage' # REQUIRED # The directory where the generated report should be saved.
-      reporttypes: 'HtmlInline_AzurePipelines;Cobertura' # The output formats and scope (separated by semicolon) Values: Badges, Clover, Cobertura, CsvSummary, Html, HtmlChart, HtmlInline, HtmlInline_AzurePipelines, HtmlInline_AzurePipelines_Dark, HtmlSummary, JsonSummary, Latex, LatexSummary, lcov, MarkdownSummary, MHtml, PngChart, SonarQube, TeamCitySummary, TextSummary, Xml, XmlSummary
-      sourcedirs: '$(Build.SourcesDirectory)' # Optional directories which contain the corresponding source code (separated by semicolon). The source directories are used if coverage report contains classes without path information.
-      verbosity: 'Info' # The verbosity level of the log messages. Values: Verbose, Info, Warning, Error, Off
-      tag: '$(build.buildnumber)_#$(build.buildid)_$(Build.SourceBranchName)' # Optional tag or build version.
-  - task: PublishCodeCoverageResults@1
+      addSpnToEnvironment: true
+      azureSubscription: $(AZURESUBSCRIPTION_SERVICE_CONNECTION_NAME)
+      scriptType: pscore
+      scriptLocation: inlineScript
+      inlineScript: |
+        Write-Host "##vso[task.setvariable variable=AZURESUBSCRIPTION_CLIENT_ID;]$env:AZURESUBSCRIPTION_CLIENT_ID"
+        Write-Host "##vso[task.setvariable variable=AZURESUBSCRIPTION_TENANT_ID;]$env:AZURESUBSCRIPTION_TENANT_ID"
+        gci env:* | sort-object name
+
+  - template: include-runtests-linux.yml
+    parameters:
+      RunName: 'SQLDB'
+      # AZURESERVER must be defined as a variable in the pipeline
+      SQLCMDSERVER: $(AZURESERVER)
+  - task: UseDotNet@2
+    inputs:
+      packageType: 'runtime'
+      version: '8.x'
+
+  - task: PublishCodeCoverageResults@2
     inputs:
-      codeCoverageTool: Cobertura 
       pathToSources: '$(Build.SourcesDirectory)'
-      summaryFileLocation: $(Build.SourcesDirectory)/coverage/*.xml
-      reportDirectory: $(Build.SourcesDirectory)/coverage
+      summaryFileLocation: $(Build.SourcesDirectory)/**/*coverage.xml
       failIfCoverageEmpty: true
     condition: always()
     continueOnError: true
-    env:
-      disable.coverage.autogenerate: 'true'
 
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: ‘Component Detection’
+  

.pipelines/include-runtests-linux.yml

@@ -7,9 +7,6 @@ parameters:
 - name: SQLPASSWORD
   type: string
   default: ''
-- name: AZURECLIENTSECRET
-  type: string
-  default: ''
 - name: SQLCMDSERVER
   type: string
   default: .
@@ -28,11 +25,11 @@ steps:
       SQLPASSWORD: ${{ parameters.SQLPASSWORD }}
       SQLCMDUSER: ${{ parameters.SQLCMDUSER }}
       SQLCMDPASSWORD: ${{ parameters.SQLPASSWORD }}
-      AZURE_TENANT_ID: $(AZURE_TENANT_ID)
-      AZURE_CLIENT_ID: $(AZURE_CLIENT_ID)
-      AZURE_CLIENT_SECRET: ${{ parameters.AZURECLIENTSECRET }}
       SQLCMDSERVER: ${{ parameters.SQLCMDSERVER }}
       SQLCMDDBNAME: ${{ parameters.SQLCMDDBNAME }}
+      AZURESUBSCRIPTION_CLIENT_ID: $(AZURESUBSCRIPTION_CLIENT_ID)
+      AZURESUBSCRIPTION_TENANT_ID: $(AZURESUBSCRIPTION_TENANT_ID)
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     continueOnError: true
 
   - task: PublishTestResults@2

NOTICE.md

@@ -6,8 +6,8 @@ This repository incorporates material as listed below or described in the code.
 ## github.com/Azure/azure-sdk-for-go/sdk/azcore
 
 * Name: github.com/Azure/azure-sdk-for-go/sdk/azcore
-* Version: v1.11.1
-* License: [MIT](https://github.com/Azure/azure-sdk-for-go/blob/sdk/azcore/v1.11.1/sdk/azcore/LICENSE.txt)
+* Version: v1.18.0
+* License: [MIT](https://github.com/Azure/azure-sdk-for-go/blob/sdk/azcore/v1.18.0/sdk/azcore/LICENSE.txt)
 
 ```
 MIT License
@@ -37,8 +37,8 @@ SOFTWARE
 ## github.com/Azure/azure-sdk-for-go/sdk/azidentity
 
 * Name: github.com/Azure/azure-sdk-for-go/sdk/azidentity
-* Version: v1.6.0
-* License: [MIT](https://github.com/Azure/azure-sdk-for-go/blob/sdk/azidentity/v1.6.0/sdk/azidentity/LICENSE.txt)
+* Version: v1.10.1
+* License: [MIT](https://github.com/Azure/azure-sdk-for-go/blob/sdk/azidentity/v1.10.1/sdk/azidentity/LICENSE.txt)
 
 ```
 MIT License
@@ -68,8 +68,8 @@ SOFTWARE
 ## github.com/Azure/azure-sdk-for-go/sdk/internal
 
 * Name: github.com/Azure/azure-sdk-for-go/sdk/internal
-* Version: v1.8.0
-* License: [MIT](https://github.com/Azure/azure-sdk-for-go/blob/sdk/internal/v1.8.0/sdk/internal/LICENSE.txt)
+* Version: v1.11.1
+* License: [MIT](https://github.com/Azure/azure-sdk-for-go/blob/sdk/internal/v1.11.1/sdk/internal/LICENSE.txt)
 
 ```
 MIT License
@@ -99,8 +99,8 @@ SOFTWARE
 ## github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys
 
 * Name: github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys
-* Version: v1.0.1
-* License: [MIT](https://github.com/Azure/azure-sdk-for-go/blob/sdk/security/keyvault/azkeys/v1.0.1/sdk/security/keyvault/azkeys/LICENSE.txt)
+* Version: v1.3.1
+* License: [MIT](https://github.com/Azure/azure-sdk-for-go/blob/sdk/security/keyvault/azkeys/v1.3.1/sdk/security/keyvault/azkeys/LICENSE.txt)
 
 ```
     MIT License
@@ -129,8 +129,8 @@ SOFTWARE
 ## github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal
 
 * Name: github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal
-* Version: v1.0.0
-* License: [MIT](https://github.com/Azure/azure-sdk-for-go/blob/sdk/security/keyvault/internal/v1.0.0/sdk/security/keyvault/internal/LICENSE.txt)
+* Version: v1.1.1
+* License: [MIT](https://github.com/Azure/azure-sdk-for-go/blob/sdk/security/keyvault/internal/v1.1.1/sdk/security/keyvault/internal/LICENSE.txt)
 
 ```
     MIT License
@@ -159,8 +159,8 @@ SOFTWARE
 ## github.com/AzureAD/microsoft-authentication-library-for-go/apps
 
 * Name: github.com/AzureAD/microsoft-authentication-library-for-go/apps
-* Version: v1.2.2
-* License: [MIT](https://github.com/AzureAD/microsoft-authentication-library-for-go/blob/v1.2.2/LICENSE)
+* Version: v1.4.2
+* License: [MIT](https://github.com/AzureAD/microsoft-authentication-library-for-go/blob/v1.4.2/LICENSE)
 
 ```
     MIT License
@@ -6641,8 +6641,8 @@ THE SOFTWARE.
 ## golang.org/x/crypto
 
 * Name: golang.org/x/crypto
-* Version: v0.37.0
-* License: [BSD-3-Clause](https://cs.opensource.google/go/x/crypto/+/v0.37.0:LICENSE)
+* Version: v0.38.0
+* License: [BSD-3-Clause](https://cs.opensource.google/go/x/crypto/+/v0.38.0:LICENSE)
 
 ```
 Copyright 2009 The Go Authors.
@@ -6678,8 +6678,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ## golang.org/x/net
 
 * Name: golang.org/x/net
-* Version: v0.39.0
-* License: [BSD-3-Clause](https://cs.opensource.google/go/x/net/+/v0.39.0:LICENSE)
+* Version: v0.40.0
+* License: [BSD-3-Clause](https://cs.opensource.google/go/x/net/+/v0.40.0:LICENSE)
 
 ```
 Copyright 2009 The Go Authors.
@@ -6789,8 +6789,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ## golang.org/x/text
 
 * Name: golang.org/x/text
-* Version: v0.24.0
-* License: [BSD-3-Clause](https://cs.opensource.google/go/x/text/+/v0.24.0:LICENSE)
+* Version: v0.25.0
+* License: [BSD-3-Clause](https://cs.opensource.google/go/x/text/+/v0.25.0:LICENSE)
 
 ```
 Copyright 2009 The Go Authors.

cmd/sqlcmd/sqlcmd.go

@@ -11,6 +11,7 @@ import (
 	"net"
 	"os"
 	"regexp"
+	"runtime/trace"
 	"strconv"
 	"strings"
 	"time"
@@ -79,6 +80,7 @@ type SQLCmdArguments struct {
 	EnableColumnEncryption      bool
 	ChangePassword              string
 	ChangePasswordAndExit       string
+	TraceFile                   string
 	// Keep Help at the end of the list
 	Help bool
 }
@@ -315,7 +317,7 @@ func checkDefaultValue(args []string, i int) (val string) {
 		'L': "|", // | is the sentinel for no value since users are unlikely to use it. It's "reserved" in most shells
 		'X': "0",
 	}
-	if isFlag(args[i]) && (len(args) == i+1 || args[i+1][0] == '-') {
+	if isFlag(args[i]) && len(args[i]) == 2 && (len(args) == i+1 || args[i+1][0] == '-') {
 		if v, ok := flags[rune(args[i][1])]; ok {
 			val = v
 			return
@@ -382,6 +384,7 @@ func SetScreenWidthFlags(args *SQLCmdArguments, rootCmd *cobra.Command) {
 func setFlags(rootCmd *cobra.Command, args *SQLCmdArguments) {
 	rootCmd.SetFlagErrorFunc(flagErrorHandler)
 	rootCmd.Flags().BoolVarP(&args.Help, "help", "?", false, localizer.Sprintf("-? shows this syntax summary, %s shows modern sqlcmd sub-command help", localizer.HelpFlag))
+	rootCmd.Flags().StringVar(&args.TraceFile, "trace-file", "", localizer.Sprintf("Write runtime trace to the specified file. Only for advanced debugging."))
 	var inputfiles []string
 	rootCmd.Flags().StringSliceVarP(&args.InputFile, "input-file", "i", inputfiles, localizer.Sprintf("Identifies one or more files that contain batches of SQL statements. If one or more files do not exist, sqlcmd will exit. Mutually exclusive with %s/%s", localizer.QueryAndExitFlag, localizer.QueryFlag))
 	rootCmd.Flags().StringVarP(&args.OutputFile, "output-file", "o", "", localizer.Sprintf("Identifies the file that receives output from sqlcmd"))
@@ -395,7 +398,26 @@ func setFlags(rootCmd *cobra.Command, args *SQLCmdArguments) {
 	rootCmd.Flags().StringVarP(&args.Query, "query", "Q", "", localizer.Sprintf("Executes a query when sqlcmd starts and then immediately exits sqlcmd. Multiple-semicolon-delimited queries can be executed"))
 	rootCmd.Flags().StringVarP(&args.Server, "server", "S", "", localizer.Sprintf("%s Specifies the instance of SQL Server to which to connect. It sets the sqlcmd scripting variable %s.", localizer.ConnStrPattern, localizer.ServerEnvVar))
 	_ = rootCmd.Flags().IntP(disableCmdAndWarn, "X", 0, localizer.Sprintf("%s Disables commands that might compromise system security. Passing 1 tells sqlcmd to exit when disabled commands are run.", "-X[1]"))
-	rootCmd.Flags().StringVar(&args.AuthenticationMethod, "authentication-method", "", localizer.Sprintf("Specifies the SQL authentication method to use to connect to Azure SQL Database. One of: ActiveDirectoryDefault, ActiveDirectoryIntegrated, ActiveDirectoryPassword, ActiveDirectoryInteractive, ActiveDirectoryManagedIdentity, ActiveDirectoryServicePrincipal, ActiveDirectoryAzCli, ActiveDirectoryDeviceCode, SqlPassword"))
+	rootCmd.Flags().StringVar(&args.AuthenticationMethod, "authentication-method", "", localizer.Sprintf(
+		"Specifies the SQL authentication method to use to connect to Azure SQL Database. One of: %s",
+		strings.Join([]string{
+			azuread.ActiveDirectoryDefault,
+			azuread.ActiveDirectoryIntegrated,
+			azuread.ActiveDirectoryPassword,
+			azuread.ActiveDirectoryInteractive,
+			azuread.ActiveDirectoryManagedIdentity,
+			azuread.ActiveDirectoryServicePrincipal,
+			azuread.ActiveDirectoryServicePrincipalAccessToken,
+			azuread.ActiveDirectoryAzCli,
+			azuread.ActiveDirectoryDeviceCode,
+			azuread.ActiveDirectoryWorkloadIdentity,
+			azuread.ActiveDirectoryClientAssertion,
+			azuread.ActiveDirectoryAzurePipelines,
+			azuread.ActiveDirectoryEnvironment,
+			azuread.ActiveDirectoryAzureDeveloperCli,
+			"SqlPassword",
+		}, ", "),
+	))
 	rootCmd.Flags().BoolVarP(&args.UseAad, "use-aad", "G", false, localizer.Sprintf("Tells sqlcmd to use ActiveDirectory authentication. If no user name is provided, authentication method ActiveDirectoryDefault is used. If a password is provided, ActiveDirectoryPassword is used. Otherwise ActiveDirectoryInteractive is used"))
 	rootCmd.Flags().BoolVarP(&args.DisableVariableSubstitution, "disable-variable-substitution", "x", false, localizer.Sprintf("Causes sqlcmd to ignore scripting variables. This parameter is useful when a script contains many %s statements that may contain strings that have the same format as regular variables, such as $(variable_name)", localizer.InsertKeyword))
 	var variables map[string]string
@@ -742,6 +764,18 @@ func isConsoleInitializationRequired(connect *sqlcmd.ConnectSettings, args *SQLC
 }
 
 func run(vars *sqlcmd.Variables, args *SQLCmdArguments) (int, error) {
+	if args.TraceFile != "" {
+		traceFile, err := os.Create(args.TraceFile)
+		if err != nil {
+			return 1, localizer.Errorf("failed to create trace file '%s': %v", args.TraceFile, err)
+		}
+		defer traceFile.Close()
+		err = trace.Start(traceFile)
+		if err != nil {
+			return 1, localizer.Errorf("failed to start trace: %v", err)
+		}
+		defer trace.Stop()
+	}
 	wd, err := os.Getwd()
 	if err != nil {
 		return 1, err