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.

Sign up for GitHub

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

Jump to bottom

Remove the storageAccountKey parameter from all JSON configs and schemas #780

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Remove the storageAccountKey parameter from all JSON configs and schemas #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12a88ed
remove the storageAccountKey parameter from all JSON configs and schemas
motus Jul 9, 2024
a35011e
Merge branch 'main' into sergiym/svc/rm_storageAccountKey
motus Jul 22, 2024
fa48bbc
Merge branch 'main' into sergiym/svc/rm_storageAccountKey
motus Jul 23, 2024
b90ec49
Merge branch 'main' into sergiym/svc/rm_storageAccountKey
motus Jul 31, 2024
e71d9ee
Merge branch 'main' into sergiym/svc/rm_storageAccountKey
bpkroth Aug 8, 2024
db7c760
Merge branch 'main' into sergiym/svc/rm_storageAccountKey
motus Aug 15, 2024
95e8698
Merge branch 'main' into sergiym/svc/rm_storageAccountKey
motus Aug 16, 2024
7452353
Merge branch 'main' into sergiym/svc/rm_storageAccountKey
motus Sep 26, 2024
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
3 changes: 1 addition & 2 deletions mlos_bench/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ This data produced in the `global_config_azure.jsonc` file is in the format that
```jsonc
{
"subscription": "some-guid",
"tenant": "some-other-guid",
"storageAccountKey": "some-base-64-encoded-key",
"tenant": "some-other-guid"
}
```

Expand Down
2 changes: 0 additions & 2 deletions mlos_bench/mlos_bench/config/environments/os/linux/boot/boot-ubuntu.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"vmName",
"storageAccountName",
"storageFileShareName",
"storageAccountKey",
"mountPoint",
"experiment_id",
"trial_id"
Expand All @@ -63,7 +62,6 @@
"shell_env_params": [
"storageAccountName",
"storageFileShareName",
"storageAccountKey",
"mountPoint",
"experiment_id",
"trial_id"
Expand Down
2 changes: 0 additions & 2 deletions mlos_bench/mlos_bench/config/environments/os/linux/runtime/setup-ubuntu.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"vmName",
"storageAccountName",
"storageFileShareName",
"storageAccountKey",
"mountPoint",
"experiment_id",
"trial_id"
Expand All @@ -65,7 +64,6 @@
"shell_env_params": [
"storageAccountName",
"storageFileShareName",
"storageAccountKey",
"mountPoint",
"experiment_id",
"trial_id"
Expand Down
4 changes: 0 additions & 4 deletions ...ch/mlos_bench/config/schemas/services/remote/azure/azure-fileshare-service-subschema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
"storageFileShareName": {
"description": "Azure storage file share name.",
"type": "string"
},
"storageAccountKey": {
"description": "Azure storage account key (typically provided in the global config in order to omit from source control).",
"type": "string"
}
},
"required": [
Expand Down
3 changes: 1 addition & 2 deletions mlos_bench/mlos_bench/config/services/remote/azure/service-fileshare.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"class": "mlos_bench.services.remote.azure.AzureFileShareService",
"config": {
"storageAccountName": "PLACEHOLDER; e.g.: osatsharedstorage",
"storageFileShareName": "PLACEHOLDER; e.g.: os-autotune-file-share",
"storageAccountKey": "PLACEHOLDER; comes from global config"
"storageFileShareName": "PLACEHOLDER; e.g.: os-autotune-file-share"
}
}
1 change: 0 additions & 1 deletion mlos_bench/mlos_bench/tests/config/experiments/experiment_test_config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// FIXME: The setup ubuntu configs currently use these values in their mounting scripts.
// We should abstract that out so those details are only needed when a service that uses those is used.
"storageAccountName": "foo",
"storageAccountKey": "bar",
"storageFileShareName": "baz",

// Assign some values to variadic tunables and required parameters present in the config examples.
Expand Down
5 changes: 2 additions & 3 deletions ...nfig/schemas/services/test-cases/bad/invalid/azure_fileshare_service-config-missing.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"class": "mlos_bench.services.remote.azure.AzureFileShareService",
"config": {
"storageAccountName": "storage-account-name",
//"storageFileShareName": "required param missing",
"storageAccountKey": "required param missing"
// "storageAccountName": "storage-account-name",
"storageFileShareName": "required param missing"
}
}
1 change: 0 additions & 1 deletion ...fig/schemas/services/test-cases/bad/unhandled/azure_fileshare_service-config-extras.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"config": {
"storageAccountName": "storage-account-name",
"storageFileShareName": "file-share-name",
"storageAccountKey": "storage-account-key-blob",

"extra": "invalid"
}
Expand Down
1 change: 0 additions & 1 deletion ...ch/tests/config/schemas/services/test-cases/bad/unhandled/azure_flex_service-extras.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// 3 unhandled config parameters:
"storageAccountName": "storage-account-name",
"storageFileShareName": "file-share-name",
"storageAccountKey": "storage-account-key-blob",

"requestTimeout": 20
}
Expand Down
1 change: 0 additions & 1 deletion ...nch/tests/config/schemas/services/test-cases/good/full/azure_fileshare_service-full.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"config": {
"storageAccountName": "storage-account-name",
"storageFileShareName": "file-share-name",
"storageAccountKey": "storage-account-key-blob",

"pollInterval": 1,
"pollTimeout": 10,
Expand Down
3 changes: 1 addition & 2 deletions ...sts/config/schemas/services/test-cases/good/partial/azure_fileshare_service-partial.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"class": "mlos_bench.services.remote.azure.AzureFileShareService",
"config": {
//"storageAccountName": "storage-account-name",
//"storageAccountKey": "storage-account-key-blob",
// "storageAccountName": "storage-account-name",
"storageFileShareName": "file-share-name"
}
}
12 changes: 1 addition & 11 deletions scripts/generate-azure-credentials-config.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,4 @@ if (-not $AZURE_STORAGE_ACCOUNT_NAME) {
Write-Error "Missing default az storage account name config."
}

az account get-access-token `
--query "{tenant:tenant,subscription:subscription}" |
ConvertFrom-Json |
Add-Member "storageAccountKey" (
az storage account keys list `
--resource-group $AZURE_DEFAULTS_GROUP `
--account-name $AZURE_STORAGE_ACCOUNT_NAME `
--query "[0].value" `
--output tsv `
) -PassThru |
ConvertTo-Json
az account get-access-token --query "{tenant:tenant,subscription:subscription}"
8 changes: 1 addition & 7 deletions scripts/generate-azure-credentials-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,4 @@ AZURE_DEFAULTS_GROUP=${AZURE_DEFAULTS_GROUP:-$(az config get --local defaults.gr
AZURE_STORAGE_ACCOUNT_RG=${AZURE_STORAGE_ACCOUNT_RG:-$AZURE_DEFAULTS_GROUP}
AZURE_STORAGE_ACCOUNT_NAME=${AZURE_STORAGE_ACCOUNT_NAME:-$(az config get --local storage.account --query value -o tsv)}

az account get-access-token \
--query "{tenant:tenant,subscription:subscription}" |
jq ".storageAccountKey = `
az storage account keys list \
--resource-group $AZURE_STORAGE_ACCOUNT_RG \
--account-name $AZURE_STORAGE_ACCOUNT_NAME \
--query '[0].value'`"
az account get-access-token --query "{tenant:tenant,subscription:subscription}"
Loading