Skip to content

Commit 7acd9a8

Browse files
author
David Shiflet (from Dev Box)
committed
add more auth types
1 parent 94a90f0 commit 7acd9a8

11 files changed

Lines changed: 3187 additions & 1189 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*.dylib
77
bin
88
obj
9-
9+
.vscode/*
1010
# Test binary, built with `go test -c`
1111
*.test
1212

.pipelines/TestSql2017.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
variables:
2-
# AZURE_CLIENT_SECRET and SQLPASSWORD must be defined as secret variables in the pipeline.
3-
# AZURE_TENANT_ID and AZURE_CLIENT_ID are not expected to be secret variables, just regular variables
4-
AZURECLIENTSECRET: $(AZURE_CLIENT_SECRET)
52
PASSWORD: $(SQLPASSWORD)
63
pool:
74
vmImage: 'ubuntu-latest'
@@ -21,13 +18,20 @@ steps:
2118
SQLCMDUSER: sa
2219
SQLPASSWORD: $(PASSWORD)
2320

24-
# The use of client secrets is disallowed now, so commenting out the Azure tests until we can switch to a federated credential.
25-
# - template: include-runtests-linux.yml
26-
# parameters:
27-
# RunName: 'SQLDB'
28-
# # AZURESERVER must be defined as a variable in the pipeline
29-
# SQLCMDSERVER: $(AZURESERVER)
30-
# AZURECLIENTSECRET: $(AZURECLIENTSECRET)
21+
- task: AzureCLI@2
22+
inputs:
23+
addSpnToEnvironment: true
24+
azureSubscription: $(AZURESUBSCRIPTION_SERVICE_CONNECTION_NAME)
25+
scriptType: pscore
26+
scriptLocation: inlineScript
27+
inlineScript: |
28+
gci env:* | sort-object name
29+
30+
- template: include-runtests-linux.yml
31+
parameters:
32+
RunName: 'SQLDB'
33+
# AZURESERVER must be defined as a variable in the pipeline
34+
SQLCMDSERVER: $(AZURESERVER)
3135

3236
- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
3337
displayName: Merge coverage data

.pipelines/include-runtests-linux.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ parameters:
77
- name: SQLPASSWORD
88
type: string
99
default: ''
10-
- name: AZURECLIENTSECRET
11-
type: string
12-
default: ''
1310
- name: SQLCMDSERVER
1411
type: string
1512
default: .
@@ -28,9 +25,6 @@ steps:
2825
SQLPASSWORD: ${{ parameters.SQLPASSWORD }}
2926
SQLCMDUSER: ${{ parameters.SQLCMDUSER }}
3027
SQLCMDPASSWORD: ${{ parameters.SQLPASSWORD }}
31-
AZURE_TENANT_ID: $(AZURE_TENANT_ID)
32-
AZURE_CLIENT_ID: $(AZURE_CLIENT_ID)
33-
AZURE_CLIENT_SECRET: ${{ parameters.AZURECLIENTSECRET }}
3428
SQLCMDSERVER: ${{ parameters.SQLCMDSERVER }}
3529
SQLCMDDBNAME: ${{ parameters.SQLCMDDBNAME }}
3630
continueOnError: true

0 commit comments

Comments
 (0)