Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MSAL & Govt/National Clouds #9141

Closed
wants to merge 50 commits into from
Closed
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
bf0bf16
Enable govt cloud
Jan 29, 2020
242a5d7
Allow the cloud to be enable through settings
Jan 29, 2020
d2839ba
Better UI/UX around multi-cloud
Jan 29, 2020
c82d716
Fix mocked object
Jan 29, 2020
eb60b73
Show message to user on failure
Jan 29, 2020
89b87f7
Fix govt cloud
Feb 6, 2020
8788641
wip
Feb 12, 2020
a9cf4f4
Finish up the prompt() code
Feb 12, 2020
5df8e49
more work
Feb 12, 2020
563e0b5
Simple token cache
Feb 13, 2020
2b472f0
More work for token cache
Feb 13, 2020
43d6fb4
Merge govt cloud and clean up some more work
Feb 13, 2020
cef7b86
Enable govt cloud internally
Feb 13, 2020
4a7d5c9
Cleanup and fix errors
Feb 14, 2020
c46a0ca
Cleanup errors
Feb 14, 2020
82b46f0
Fix a credential issue
Feb 14, 2020
828b957
Finish up work for resource based tokens
Feb 14, 2020
1921939
Device code
Feb 14, 2020
e53e8f1
Merge branch 'master' into amir/msal
Feb 14, 2020
4e46943
Fix compile issues
Feb 14, 2020
2178ed6
Don't do stuff until initialized
Feb 14, 2020
8226feb
add keytar as external
Feb 14, 2020
fc95a11
Fix tests
Feb 18, 2020
47cd0a6
Merge remote-tracking branch 'remotes/origin/master' into amir/msal
Feb 18, 2020
ccb9333
Fix test issues
Feb 18, 2020
bf6f661
Fix more tests
Feb 18, 2020
2402572
Amir/msal experimental (#9214)
Feb 19, 2020
1ee8a73
Fix some of the failing tests
Feb 19, 2020
5438408
Fix some more tests
Feb 19, 2020
838ce06
remove atob
Feb 19, 2020
fed5fde
Fix linux build
Feb 19, 2020
aaaeeae
Don't repeat code
Feb 19, 2020
739e95c
Fix inconsistent variable naming
Feb 19, 2020
5f15c26
Add sudo to commands
aaomidi Feb 19, 2020
d734ccb
Cleanup debug code
Feb 19, 2020
44d6017
Remove sudo and apt update
aaomidi Feb 19, 2020
35a14f4
Merge branch 'amir/msal' of github.com:microsoft/azuredatastudio into…
aaomidi Feb 19, 2020
ec96832
Let's see if we actually need to install stuff
aaomidi Feb 20, 2020
6faa98d
Move to unstable testing
aaomidi Feb 20, 2020
4fb8edc
Fallback token cache
Feb 20, 2020
c4fe1c7
Fix small issue with credentials
Feb 20, 2020
4433d17
Allow force file storage
Feb 20, 2020
1733251
better defaults
Feb 20, 2020
0b14bb5
Change how tokens are stored
Feb 21, 2020
cf0185b
Fix tests
Feb 21, 2020
69f612d
Merge branch 'master' into amir/msal
Feb 25, 2020
1384d79
Fix bugs
Feb 26, 2020
f5cde39
Merge branch 'master' into amir/msal
Mar 12, 2020
54be114
fix yarn
Mar 12, 2020
4cdd950
Fix issue
Mar 12, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions build/azure-pipelines/linux/sql-product-build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,17 @@ steps:
displayName: Start xvfb
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

- script: |
set -e
sudo apt update
sudo apt install libsecret-1-dev gnome-keyring python-gnomekeyring
NO_AT_BRIDGE=1;
eval $(dbus-launch --sh-syntax);
eval $(echo -n "" | /usr/bin/gnome-keyring-daemon --login);
eval $(/usr/bin/gnome-keyring-daemon --components=secrets --start);
/usr/bin/python -c "import gnomekeyring;gnomekeyring.create_sync('login', '');";
displayName: Setup Key Ring

- script: |
set -e
yarn gulp package-rebuild-extensions
Expand Down
3 changes: 3 additions & 0 deletions extensions/azurecore/extension.webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@ module.exports = withDefaults({
context: __dirname,
entry: {
extension: './src/extension.ts'
},
externals: {
'keytar': 'commonjs keytar'
}
});
40 changes: 39 additions & 1 deletion extensions/azurecore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,39 @@
"description": "%config.enablePublicCloudDescription%"
}
}
},
{
"type": "object",
"title": "Azure Account Configuration",
"properties": {
"accounts.azure.enableUsGovCloud": {
"type": "boolean",
"default": false,
"description": "%config.enableUsGovCloudDescription%"
}
}
},
{
"type": "object",
"title": "Azure Account Configuration",
"properties": {
"accounts.azure.enableChinaCloud": {
"type": "boolean",
"default": false,
"description": "%config.enableChinaCloudDescription%"
}
}
},
{
"type": "object",
"title": "Azure Account Configuration",
"properties": {
"accounts.azure.enableGermanyCloud": {
"type": "boolean",
"default": false,
"description": "%config.enableGermanyCloudDescription%"
}
}
}
],
"account-type": [
Expand Down Expand Up @@ -189,14 +222,19 @@
},
"dependencies": {
"@azure/arm-resourcegraph": "^2.0.0",
"@azure/arm-subscriptions": "1.0.0",
"@azure/arm-subscriptions": "^2.0.0",
"adal-node": "^0.2.1",
"axios": "^0.19.2",
"keytar": "^5.2.0",
"qs": "^6.9.1",
"request": "2.88.0",
"vscode-nls": "^4.0.0"
},
"devDependencies": {
"@types/keytar": "^4.4.2",
"@types/mocha": "^5.2.5",
"@types/node": "^12.11.7",
"@types/qs": "^6.9.1",
"@types/request": "^2.48.1",
"mocha": "^5.2.0",
"mocha-junit-reporter": "^1.17.0",
Expand Down
Loading