Merge branch 'main' into run-staticcheck-on-multiple-platforms

Author: dlevy-msft-sql

.github/workflows/golangci-lint.yml

@@ -9,12 +9,12 @@ jobs:
     name: lint-pr-changes
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.18
-      - uses: actions/checkout@v3
+          go-version: stable
+      - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
           only-new-issues: true

.github/workflows/pr-validation.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Setup go
       uses: actions/setup-go@v2
       with:
-        go-version: '1.21'
+        go-version: '1.22'
     - name: Run tests against Linux SQL
       run: |
         go version
@@ -22,6 +22,6 @@ jobs:
         go build .
         export SQLCMDPASSWORD=$(date +%s|sha256sum|base64|head -c 32)
         export SQLCMDUSER=sa
-        docker run -m 2GB -e ACCEPT_EULA=1 -d --name sql2017 -p:1433:1433 -e SA_PASSWORD=$SQLCMDPASSWORD mcr.microsoft.com/mssql/server:2017-latest
+        docker run -m 2GB -e ACCEPT_EULA=1 -d --name sql2022 -p:1433:1433 -e SA_PASSWORD=$SQLCMDPASSWORD mcr.microsoft.com/mssql/server:2022-latest
         cd ../..
         go test -v ./...

.gitignore

@@ -6,7 +6,7 @@
 *.dylib
 bin
 obj
-
+.vscode/*
 # Test binary, built with `go test -c`
 *.test
 
@@ -32,3 +32,12 @@ darwin-arm64/sqlcmd
 linux-amd64/sqlcmd
 linux-arm64/sqlcmd
 linux-s390x/sqlcmd
+
+# Build artifacts in root
+/sqlcmd
+/sqlcmd_binary
+
+# certificates used for local testing
+*.der
+*.pem
+*.pfx

.pipelines/LocBuild.yml

@@ -0,0 +1,26 @@
+trigger: none
+pr: none
+
+pool:
+  vmImage: 'windows-latest'
+
+steps:
+  - checkout: self
+    persistCredentials: true # needed for the OneLocBuild task to access the repo
+
+  - task: OneLocBuild@2
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    inputs:
+      isCreatePrSelected: true
+      repoType: 'github'
+      locProj: internal/translations/LocProject.json
+      outDir: '$(Build.ArtifactStagingDirectory)'
+      packageSourceAuth: patAuth
+      dependencyPackageSource: 'https://pkgs.dev.azure.com/msdata/_packaging/SQLDS_SSMS/nuget/v3/index.json'
+      patVariable: $(System.AccessToken)
+
+  - task: PublishPipelineArtifact@1
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)'
+      artifact: 'drop'

.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'
@@ -10,45 +7,44 @@ steps:
   - template: include-install-go-tools.yml
 
   - task: Docker@2
-    displayName: 'Run SQL 2017 docker image'
+    displayName: 'Run SQL 2022 docker image'
     inputs:
       command: run
-      arguments: '-m 2GB -e ACCEPT_EULA=1 -d --name sql2017 -p:1433:1433 -e SA_PASSWORD=$(PASSWORD) mcr.microsoft.com/mssql/server:2017-latest'
+      arguments: '-m 2GB -e ACCEPT_EULA=1 -d --name sql2022 -p:1433:1433 -e SA_PASSWORD=$(PASSWORD) mcr.microsoft.com/mssql/server:2022-latest'
 
   - template: include-runtests-linux.yml
     parameters:
-      RunName: 'SQL2017'
+      RunName: 'SQL2022'
       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-install-go-tools.yml

@@ -1,7 +1,7 @@
 steps: 
   - task: GoTool@0
     inputs:
-      version: '1.18'
+      version: '1.22.10'
   - task: Go@0
     displayName: 'Go: get dependencies'
     inputs:

.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

.vscode/launch.json

@@ -24,7 +24,15 @@
             "request": "launch",
             "mode" : "auto",
             "program": "${workspaceFolder}/cmd/modern",
-            "args" : ["-S", "davidshi-2022", "-g", "-Q", "select nvarcharcol from encrypt.dbo.encrypted", "--driver-logging-level=65"],
+            "args" : ["-S", ".", "-Q", "select top 8 name from sys.all_objects"],
+        },
+                {
+            "name" : "Print help",
+            "type" : "go",
+            "request": "launch",
+            "mode" : "auto",
+            "program": "${workspaceFolder}/cmd/modern",
+            "args" : ["-?"],
         },
         {
             "name" : "Run file query",

.vscode/settings.json

@@ -1,4 +1,6 @@
 {
     "go.lintTool": "golangci-lint",
-    "go.lintOnSave": "workspace"
+    "go.lintOnSave": "workspace",
+    "azure-pipelines.1ESPipelineTemplatesSchemaFile": true,
+    "sarif-viewer.connectToGithubCodeScanning": "on"
 }