ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-16 20:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

use the unique-string based keyvault names (#462)

Browse Source
This commit is contained in:
bmc-msft
2021-01-25 15:02:12 -05:00
committed by GitHub
parent 4bc90a7564
commit 31ea71e8b6
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api-service/__app__/onefuzzlib/secrets.py
View File

@ -4,6 +4,7 @@
# Licensed under the MIT License. # Licensed under the MIT License.
import os
from typing import Tuple, Type, TypeVar, cast from typing import Tuple, Type, TypeVar, cast
from urllib.parse import urlparse from urllib.parse import urlparse
from uuid import uuid4 from uuid import uuid4
@ -12,7 +13,7 @@ from azure.keyvault.secrets import KeyVaultSecret
from onefuzztypes.models import SecretAddress, SecretData from onefuzztypes.models import SecretAddress, SecretData
from pydantic import BaseModel from pydantic import BaseModel
from .azure.creds import get_instance_name, get_keyvault_client from .azure.creds import get_keyvault_client
A = TypeVar("A", bound=BaseModel) A = TypeVar("A", bound=BaseModel)
@ -43,7 +44,8 @@ def get_secret_string_value(self: SecretData[str]) -> str:
def get_keyvault_address() -> str: def get_keyvault_address() -> str:
# https://docs.microsoft.com/en-us/azure/key-vault/general/about-keys-secrets-certificates#vault-name-and-object-name # https://docs.microsoft.com/en-us/azure/key-vault/general/about-keys-secrets-certificates#vault-name-and-object-name
return f"https://{get_instance_name()}-vault.vault.azure.net" keyvault_name = os.environ["ONEFUZZ_KEYVAULT"]
return f"https://{keyvault_name}.vault.azure.net"
def store_in_keyvault( def store_in_keyvault(

6
src/deployment/azuredeploy.json
View File

@ -57,7 +57,7 @@
"Network Contributor": "4d97b98b-1d4f-4787-a291-c67834d212e7", "Network Contributor": "4d97b98b-1d4f-4787-a291-c67834d212e7",
"Storage Account Contributor": "17d1049b-9a84-46fb-8f53-869881c3d3ab", "Storage Account Contributor": "17d1049b-9a84-46fb-8f53-869881c3d3ab",
"Virtual Machine Contributor": "9980e02c-c2be-4d73-94e8-173b1dc7cf3c", "Virtual Machine Contributor": "9980e02c-c2be-4d73-94e8-173b1dc7cf3c",
"keyVaultName": "[concat(parameters('name'), '-vault')]" "keyVaultName": "[concat('of-kv-', uniquestring(resourceGroup().id))]"
}, },
"functions": [ "functions": [
{ {
@ -234,6 +234,10 @@
"name": "ONEFUZZ_MONITOR", "name": "ONEFUZZ_MONITOR",
"value": "[variables('monitorAccountName')]" "value": "[variables('monitorAccountName')]"
}, },
{
"name": "ONEFUZZ_KEYVAULT",
"value": "[variables('keyVaultName')]"
},
{ {
"name": "ONEFUZZ_OWNER", "name": "ONEFUZZ_OWNER",
"value": "[parameters('owner')]" "value": "[parameters('owner')]"