Squashed commit of the following:

commit 87e0f99 Author: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed Sep 15 15:32:41 2021 -0700 Sync eng/common directory with azure-sdk-tools for PR 2016 (Azure#20706) * Make ServiceName optional for verify-changelog In cases like go where we don't pass a service name having this default to "not-specified" breaks things so we should allow for ServiceName and/or ServiceDirectory to be empty. * Put quotes around the strings to allow for empty Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com> commit c80e26e Author: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed Sep 15 12:45:42 2021 -0700 Sync eng/common directory with azure-sdk-tools for PR 2009 (Azure#20672) * Skip PSModule caching in container jobs * Add succeeded check to condition Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com> Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com> Co-authored-by: Ben Broderick Phillips <ben@benbp.net> Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com> commit 1efff7f Author: Travis Prescott <tjprescott@users.noreply.github.com> Date: Wed Sep 15 10:53:42 2021 -0700 [Search] Add skillset validation (Azure#20669) * Add client-side validation and test. * Add skillset validation test. * Make code more Pythonic. commit 6a06b0e Author: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue Sep 14 16:56:19 2021 -0700 Add for multiple levels of Atx Headers in the CHANGELOG.md (Azure#20694) Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com> commit 3fdbaa7 Author: swathipil <76007337+swathipil@users.noreply.github.com> Date: Tue Sep 14 16:27:06 2021 -0700 [EventHub] update arm template with storage conn str (Azure#20376) * update test resources * fix * fix failing tests * adams comments * pylint * remove dateutil * adams comments * nit commit 279e7eb Author: Rakshith Bhyravabhotla <sabhyrav@microsoft.com> Date: Tue Sep 14 15:22:05 2021 -0700 Add a new row type in query (Azure#20685) * Add row type * Add a new row type * add test * lint * Apply suggestions from code review * changes commit 5016742 Author: luc <44377201+LuChen-Microsoft@users.noreply.github.com> Date: Tue Sep 14 13:09:43 2021 -0700 Update changelog date (Azure#20686) * update swagger * update release date commit 080f88d Author: swathipil <76007337+swathipil@users.noreply.github.com> Date: Tue Sep 14 13:01:32 2021 -0700 [SchemaRegistry] update type of `schema` in `serialize` (Azure#20683) * update type * update sample naming commit 599a099 Author: Rakshith Bhyravabhotla <sabhyrav@microsoft.com> Date: Tue Sep 14 09:41:19 2021 -0700 Handle Errors and Tables in Query (Azure#20658) * initial commit * batch set * batch * tests + changes * more tests * lint * changelog * Apply suggestions from code review * comment * lint * querry * comments commit 3252969 Author: swathipil <76007337+swathipil@users.noreply.github.com> Date: Tue Sep 14 09:17:18 2021 -0700 [SchemaRegistry] remove codec param in serializer (Azure#20671) * remove codec * changelog commit 27b7e75 Author: msyyc <70930885+msyyc@users.noreply.github.com> Date: Tue Sep 14 16:52:11 2021 +0800 Update change_log.py (Azure#20680) commit fd80cb7 Author: Azure CLI Bot <azclibot@microsoft.com> Date: Tue Sep 14 13:52:13 2021 +0800 [AutoRelease] t2-storage-2021-09-14-45016(Do not merge) (Azure#20678) * CodeGen from PR 15627 in Azure/azure-rest-api-specs [SRP] 2021-06-01 Swagger Api (Azure#15627) * Add June21 Swagger Api version, Updated Readme files * adding abort and hnson migration swagger API * swagger: marking requesttype as required parameter for hns onmigration * Added new PublicNetworkAccess property to swagger spec * Add enableNfsV3RootSquash and enableNfsV3AllSquash to June21 swagger * Add Account Level VLW Swagger changes and example * Update Blob Inventory Api comment to include AccessTierInferred and Tags * Rename HnsOn to hierarchical namespace * [Swagger] [June21] Added defaultToOAuthAuthentication to swagger spec * Update Spell check custom words list. Correct incorrect spellings * Add missing refrences to PublicNetworkAccess Examples * Add required type:object, Add default return type for hns migration apis * Prettier tool update to storage.json * Add update account with immutability policy example * Removed StorageFileDataSmbShareOwner as Server side does not support it * Add AllowProtectedAppendWritesAll feature changes with example * Updated enum values and description for PublicNetworkAccess * Add type:object to ProtectedAppendWritesHistory ; Spellcheck * version,CHANGELOG Co-authored-by: SDKAuto <sdkautomation@microsoft.com> Co-authored-by: PythonSdkPipelines <PythonSdkPipelines> commit 3eb0af9 Author: William Harding <william.jeffrey.harding@gmail.com> Date: Mon Sep 13 16:06:06 2021 -0700 Updated notebooks to make them more "general" (Azure#15660) * Updated notebooks to make them more "general" * updated gitignore, added models, updated path * reverted gitignore * reverting gitignore * Renamed some files, changed model id to be more generic commit 69be40d Author: McCoy Patiño <39780829+mccoyp@users.noreply.github.com> Date: Mon Sep 13 15:35:26 2021 -0700 [Key Vault] Update new test resource script (Azure#20663) commit ce307fe Author: Scott Addie <10702007+scottaddie@users.noreply.github.com> Date: Mon Sep 13 17:23:16 2021 -0500 Final consistency review of Monitor Query README (Azure#20667) * Final consistency review of Monitor Query README * Add rate limits section commit c4d64b2 Author: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon Sep 13 13:50:44 2021 -0700 Sync eng/common directory with azure-sdk-tools for PR 1979 (Azure#20666) * Move logic for removing empty sections to ChangeLog-Operations.ps1 * Refactor sections regex * Add SanitizeEntry parameter Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com> commit 3a537c9 Author: Travis Prescott <tjprescott@users.noreply.github.com> Date: Mon Sep 13 13:45:21 2021 -0700 Update docstrings for custom models. (Azure#20592) commit 90ce516 Author: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon Sep 13 13:06:02 2021 -0700 Fix SemVer.ToString to handle v0 case (Azure#20665) Since we are treating v0 versions as prerelease we need to make sure we don't accidently start to add the bogus prerelease label in cases where we call ToString() on the version. Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com> commit dd67039 Author: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon Sep 13 13:04:52 2021 -0700 Sync eng/common directory with azure-sdk-tools for PR 1946 (Azure#20656) * Add ability to exit gracefully when all files in the diff are excluded * Address case where cspell exits with an error when all files from the 'files' config list are excluded by the expressions in 'ignorePaths' * Add tests * Review feedback: impl goes at the bottom and should be treated as a script, logic for testing should happen above that and exit appropriately if running tests * Import common instead of logging * Enable strict mode Co-authored-by: Daniel Jurek <djurek@microsoft.com> commit 7b2aeaf Author: swathipil <76007337+swathipil@users.noreply.github.com> Date: Mon Sep 13 10:47:42 2021 -0700 [EventHubs] update test to test async producer (Azure#19892) - call async Producer for testing/improving code coverage - remove passing in fake kwarg to PartitionContext; untested lines in PartitionContext can only be tested with a user implemented CheckpointStore class, so not worrying about this commit 8f28e2a Author: Leighton Chen <lechen@microsoft.com> Date: Mon Sep 13 10:37:18 2021 -0700 [Monitor exporter] Add OTLP and dual exporter scenario to samples (Azure#20634) * rpc * samples commit 5450368 Author: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon Sep 13 09:21:54 2021 -0700 Sync eng/common directory with azure-sdk-tools for PR 1983 (Azure#20618) * Doc Updates and Revisions for External Use The focus of these changes is to revise the script to better support use by external contributors and others outside of the Azure SDK ecosystem and without access to the Microsoft AAD Tenant. Changes include: - Creation of a new Test Application service principal is now possible from a non-Microsoft AAD tenant. - When a new Test Application principal is created, the principle of least privilege is now applied; the new Test Application is granted ownership of the resource group associated with the test resources and no longer has access to any other resources in the subscription. - If an existing Test Application principal is specified, it will be assigned ownership of the resource group created. This supports using a Test Application principal without privileges at the subscription-level. - When no provisioner is specified, the script is now executed in the context of the caller rather than the Test Application principal. This supports using a Test Application principal that has restricted privileges and better aligns to the purpose of the Test Application principal. - The `$TestApplicationOid` is now explicitly bound at the time a new Test Application principal is created rather than having to query for it later. - Common error scenarios resulting from lack of permissions now provide messaging with more context of why the failure occurred and suggest remediation. - Added new examples to illustrate the common call patterns needed by external contributors running the script, outside of the Microsoft tenant and Azure SDK ecosystem. - Documentation has been enhanced with additional context to detail the permissions and roles assigned by the script. - Added documentation details for Bicep template use. * Add the provisioner OID to the deployment params Key Vault needs this to deploy Managed HSMs. There's a corresponding change necessary in test-resources.json I'll roll out across languages. * Fixing typos and spelling mistakes Co-authored-by: Jesse Squire <jesse.squire@gmail.com> Co-authored-by: Heath Stewart <heaths@microsoft.com> commit b7b7e36 Author: Travis Prescott <tjprescott@users.noreply.github.com> Date: Mon Sep 13 09:10:38 2021 -0700 [Search] Update SearchClient.search API (Azure#20602) * Update SearchClient.search API. * Update CHANGELOG and async SearchClient. * Update parameter parsing for omitted values. * Code review comments and linter fixes. commit 4048684 Author: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Sun Sep 12 15:49:22 2021 -0700 Increment version for monitor releases (Azure#20635) Increment package version after release of azure-monitor-query
zihzhan-msft · Sep 16, 2021 · f49994b · f49994b
1 parent 09f18ae
commit f49994b
Show file tree

Hide file tree

Showing 336 changed files with 36,805 additions and 2,247 deletions.
diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1
diff --git a/eng/common/TestResources/New-TestResources.ps1.md b/eng/common/TestResources/New-TestResources.ps1.md
@@ -32,24 +32,24 @@ New-TestResources.ps1 [-BaseName <String>] [-ResourceGroupName <String>] [-Servi
 ```
 
 ## DESCRIPTION
-Deploys live test resouces specified in test-resources.json files to a resource
-group.
+Deploys live test resouces specified in test-resources.json or test-resources.bicep
+files to a new resource group.
 
 This script searches the directory specified in $ServiceDirectory recursively
-for files named test-resources.json.
-All found test-resources.json files will be
-deployed to the test resource group.
+for files named test-resources.json or test-resources.bicep.
+All found test-resources.json
+and test-resources.bicep files will be deployed to the test resource group.
 
-If no test-resources.json files are located the script exits without making
-changes to the Azure environment.
+If no test-resources.json or test-resources.bicep files are located the script
+exits without making changes to the Azure environment.
 
-A service principal must first be created before this script is run and passed
-to $TestApplicationId and $TestApplicationSecret.
-Test resources will grant this
-service principal access.
+A service principal may optionally be passed to $TestApplicationId and $TestApplicationSecret.
+Test resources will grant this service principal access to the created resources.
+If no service principal is specified, a new one will be created and assigned the
+'Owner' role for the resource group associated with the test resources.
 
-This script uses credentials already specified in Connect-AzAccount or those
-specified in $ProvisionerApplicationId and $ProvisionerApplicationSecret.
+This script runs in the context of credentials already specified in Connect-AzAccount
+or those specified in $ProvisionerApplicationId and $ProvisionerApplicationSecret.
 
 ## EXAMPLES
 
@@ -59,14 +59,88 @@ Connect-AzAccount -Subscription 'REPLACE_WITH_SUBSCRIPTION_ID'
 New-TestResources.ps1 keyvault
 ```
 
-Run this in a desktop environment to create new AAD apps and Service Principals
-that can be used to provision resources and run live tests.
+Run this in a desktop environment to create a new AAD application and Service Principal
+for running live tests against the test resources created.
+The principal will have ownership
+rights to the resource group and the resources that it contains, but no other resources in
+the subscription.
 
 Requires PowerShell 7 to use ConvertFrom-SecureString -AsPlainText or convert
 the SecureString to plaintext by another means.
 
 ### EXAMPLE 2
 ```
+Connect-AzAccount -Subscription 'REPLACE_WITH_SUBSCRIPTION_ID'
+New-TestResources.ps1 `
+    -BaseName 'azsdk' `
+    -ServiceDirectory 'keyvault' `
+    -SubscriptionId 'REPLACE_WITH_SUBSCRIPTION_ID' `
+    -ResourceGroupName 'REPLACE_WITH_NAME_FOR_RESOURCE_GROUP' `
+    -Location 'eastus'
+```
+
+Run this in a desktop environment to specify the name and location of the resource
+group that test resources are being deployed to.
+This will also create a new AAD
+application and Service Principal for running live tests against the rest resources
+created.
+The principal will have ownership rights to the resource group and the
+resources that it contains, but no other resources in the subscription.
+
+Requires PowerShell 7 to use ConvertFrom-SecureString -AsPlainText or convert
+the SecureString to plaintext by another means.
+
+### EXAMPLE 3
+```
+Connect-AzAccount -Subscription 'REPLACE_WITH_SUBSCRIPTION_ID'
+New-TestResources.ps1 `
+    -BaseName 'azsdk' `
+    -ServiceDirectory 'keyvault' `
+    -SubscriptionId 'REPLACE_WITH_SUBSCRIPTION_ID' `
+    -ResourceGroupName 'REPLACE_WITH_NAME_FOR_RESOURCE_GROUP' `
+    -Location 'eastus' `
+    -TestApplicationId 'REPLACE_WITH_TEST_APPLICATION_ID' `
+    -TestApplicationSecret 'REPLACE_WITH_TEST_APPLICATION_SECRET'
+```
+
+Run this in a desktop environment to specify the name and location of the resource
+group that test resources are being deployed to.
+This will grant ownership rights
+to the 'TestApplicationId' for the resource group and the resources that it contains,
+without altering its existing permissions.
+
+### EXAMPLE 4
+```
+New-TestResources.ps1 `
+    -BaseName 'azsdk' `
+    -ServiceDirectory 'keyvault' `
+    -SubscriptionId 'REPLACE_WITH_SUBSCRIPTION_ID' `
+    -ResourceGroupName 'REPLACE_WITH_NAME_FOR_RESOURCE_GROUP' `
+    -Location 'eastus' `
+    -ProvisionerApplicationId 'REPLACE_WITH_PROVISIONER_APPLICATION_ID' `
+    -ProvisionerApplicationSecret 'REPLACE_WITH_PROVISIONER_APPLICATION_ID' `
+    -TestApplicationId 'REPLACE_WITH_TEST_APPLICATION_ID' `
+    -TestApplicationOid 'REPLACE_WITH_TEST_APPLICATION_OBJECT_ID' `
+    -TestApplicationSecret 'REPLACE_WITH_TEST_APPLICATION_SECRET'
+```
+
+Run this in a desktop environment to specify the name and location of the resource
+group that test resources are being deployed to.
+The script will be executed in the
+context of the 'ProvisionerApplicationId' rather than the caller.
+
+Depending on the permissions of the Provisioner Application principal, the script may
+grant ownership rights 'TestApplicationId' for the resource group and the resources
+that it contains, or may emit a message indicating that it was unable to perform the grant.
+
+For the Provisioner Application principal to perform the grant, it will need the
+permission 'Application.ReadWrite.OwnedBy' for the Microsoft Graph API.
+
+Requires PowerShell 7 to use ConvertFrom-SecureString -AsPlainText or convert
+the SecureString to plaintext by another means.
+
+### EXAMPLE 5
+```
 New-TestResources.ps1 `
     -BaseName 'Generated' `
     -ServiceDirectory '$(ServiceDirectory)' `
@@ -111,7 +185,10 @@ Accept wildcard characters: False
 
 ### -ResourceGroupName
 Set this value to deploy directly to a Resource Group that has already been
-created.
+created or to create a new resource group with this name.
+
+If not specified, the $BaseName will be used to generate name for the resource
+group that will be created.
 
 ```yaml
 Type: String
@@ -127,8 +204,10 @@ Accept wildcard characters: False
 
 ### -ServiceDirectory
 A directory under 'sdk' in the repository root - optionally with subdirectories
-specified - in which to discover ARM templates named 'test-resources.json'.
-This can also be an absolute path or specify parent directories.
+specified - in which to discover ARM templates named 'test-resources.json' and
+Bicep templates named 'test-resources.bicep'.
+This can also be an absolute path
+or specify parent directories.
 
 ```yaml
 Type: String
@@ -143,10 +222,19 @@ Accept wildcard characters: False
 ```
 
 ### -TestApplicationId
-The AAD Application ID to authenticate the test runner against deployed
-resources.
+Optional Azure Active Directory Application ID to authenticate the test runner
+against deployed resources.
 Passed to the ARM template as 'testApplicationId'.
 
+If not specified, a new AAD Application will be created and assigned the 'Owner'
+role for the resource group associated with the test resources.
+No permissions
+will be granted to the subscription or other resources.
+
+For those specifying a Provisioner Application principal as 'ProvisionerApplicationId',
+it will need the permission 'Application.ReadWrite.OwnedBy' for the Microsoft Graph API
+in order to create the Test Application principal.
+
 This application is used by the test runner to execute tests against the
 live test resources.
 
@@ -184,14 +272,20 @@ Accept wildcard characters: False
 ```
 
 ### -TestApplicationOid
-Service Principal Object ID of the AAD Test application.
+Service Principal Object ID of the AAD Test Application.
 This is used to assign
 permissions to the AAD application so it can access tested features on the live
 test resources (e.g.
 Role Assignments on resources).
 It is passed as to the ARM
 template as 'testApplicationOid'
 
+If not specified, an attempt will be made to query it from the Azure Active Directory
+tenant.
+For those specifying a service principal as 'ProvisionerApplicationId',
+it will need the permission 'Application.Read.All' for the Microsoft Graph API
+in order to query AAD.
+
 For more information on the relationship between AAD Applications and Service
 Principals see: https://docs.microsoft.com/azure/active-directory/develop/app-objects-and-service-principals
 
@@ -211,8 +305,8 @@ Accept wildcard characters: False
 The tenant ID of a service principal when a provisioner is specified.
 The same
 Tenant ID is used for Test Application and Provisioner Application.
-This value
-is passed to the ARM template as 'tenantId'.
+
+This value is passed to the ARM template as 'tenantId'.
 
 ```yaml
 Type: String
@@ -250,10 +344,23 @@ Accept wildcard characters: False
 ```
 
 ### -ProvisionerApplicationId
-The AAD Application ID used to provision test resources when a provisioner is
-specified.
+Optional Application ID of the Azure Active Directory service principal to use for
+provisioning the test resources.
+If not, specified New-TestResources.ps1 uses the
+context of the caller to provision.
 
-If none is specified New-TestResources.ps1 uses the TestApplicationId.
+If specified, the Provisioner Application principal would benefit from the following
+permissions to the Microsoft Graph API:
+
+  - 'Application.Read.All' in order to query AAD to obtain the 'TestApplicaitonOid'
+
+  - 'Application.ReadWrite.OwnedBy' in order to create the Test Application principal
+     or grant an existing principal ownership of the resource group associated with
+     the test resources.
+
+If the provisioner does not have these permissions, it can still be used with
+New-TestResources.ps1 by specifying an existing Test Application principal, including
+its Object ID, and managing permissions to the resource group manually.
 
 This value is not passed to the ARM template.
 
@@ -273,8 +380,6 @@ Accept wildcard characters: False
 A service principal secret (password) used to provision test resources when a
 provisioner is specified.
 
-If none is specified New-TestResources.ps1 uses the TestApplicationSecret.
-
 This value is not passed to the ARM template.
 
 ```yaml
@@ -335,7 +440,7 @@ Accept wildcard characters: False
 ```
 
 ### -Environment
-Name of the cloud environment.
+Optional name of the cloud environment.
 The default is the Azure Public Cloud
 ('AzureCloud')
 
@@ -428,10 +533,17 @@ Accept wildcard characters: False
 ```
 
 ### -OutFile
-Save test environment settings into a test-resources.json.env file next to test-resources.json.
-File is protected via DPAPI.
-Supported only on windows.
-The environment file would be scoped to the current repository directory.
+Save test environment settings into a .env file next to test resources template.
+The contents of the file are protected via the .NET Data Protection API (DPAPI).
+This is supported only on Windows.
+The environment file is scoped to the current
+service directory.
+
+The environment file will be named for the test resources template that it was
+generated for.
+For ARM templates, it will be test-resources.json.env.
+For
+Bicep templates, test-resources.bicep.env.
 
 ```yaml
 Type: SwitchParameter

diff --git a/eng/common/TestResources/README.md b/eng/common/TestResources/README.md
@@ -1,8 +1,8 @@
 # Live Test Resource Management
 
 Running and recording live tests often requires first creating some resources
-in Azure. Service directories that include a test-resources.json file require
-running [New-TestResources.ps1][] to create these resources and output
+in Azure. Service directories that include a `test-resources.json` or `test-resources.bicep` 
+file require running [New-TestResources.ps1][] to create these resources and output
 environment variables you must set.
 
 The following scripts can be used both in on your desktop for developer
@@ -19,9 +19,10 @@ scenarios as well as on hosted agents for continuous integration testing.
 ## On the Desktop
 
 To set up your Azure account to run live tests, you'll need to log into Azure,
-and set up your resources defined in test-resources.json as shown in the following
-example using Azure Key Vault. The script will create a service principal automatically,
-or you may create a service principal you can save and reuse subsequently.
+and create the resources defined in your `test-resources.json` or `test-resources.bicep` 
+template as shown in the following example using Azure Key Vault. The script will create 
+a service principal automatically, or you may create a service principal that can be reused
+subsequently.
 
 Note that `-Subscription` is an optional parameter but recommended if your account
 is a member of multiple subscriptions. If you didn't specify it when logging in,
@@ -33,8 +34,9 @@ Connect-AzAccount -Subscription 'YOUR SUBSCRIPTION ID'
 eng\common\TestResources\New-TestResources.ps1 keyvault
 ```
 
-The `OutFile` switch will be set by default if you are running this for a .NET project on Windows. This will save test environment settings
-into a test-resources.json.env file next to test-resources.json. The file is protected via DPAPI.
+The `OutFile` switch will be set by default if you are running this for a .NET project on Windows. 
+This will save test environment settings into a `test-resources.json.env` file next to `test-resources.json` 
+or a `test-resources.bicep.env` file next to `test-resources.bicep`. The file is protected via DPAPI.
 The environment file would be scoped to the current repository directory and avoids the need to
 set environment variables or restart your IDE to recognize them.
 

diff --git a/eng/common/pipelines/templates/steps/cache-ps-modules.yml b/eng/common/pipelines/templates/steps/cache-ps-modules.yml
@@ -3,8 +3,12 @@ steps:
     . ./eng/common/scripts/Helpers/PSModule-Helpers.ps1
     Write-Host "##vso[task.setvariable variable=CachedPSModulePath]$global:CurrentUserModulePath"
   displayName: Set PS Modules Cache Directory
+  # Containers should bake modules into the image to save on pipeline time
+  condition: and(succeeded(), eq(variables['Container'], ''))
 - task: Cache@2
   inputs:
     key: 'PSModulePath | $(CacheSalt) | $(Agent.OS) | $(Build.SourcesDirectory)/eng/common/scripts/Import-AzModules.ps1'
     path: $(CachedPSModulePath)
-  displayName: Cache PS Modules
+  displayName: Cache PS Modules
+  # Containers should bake modules into the image to save on pipeline time
+  condition: and(succeeded(), eq(variables['Container'], ''))
diff --git a/eng/common/pipelines/templates/steps/verify-changelog.yml b/eng/common/pipelines/templates/steps/verify-changelog.yml
@@ -4,7 +4,7 @@ parameters:
   default: 'not-specified'
 - name: ServiceName
   type: string
-  default: 'not-specified'
+  default: ''
 - name: ServiceDirectory
   type: string
   default: ''
@@ -17,10 +17,10 @@ steps:
     inputs:
       filePath: $(Build.SourcesDirectory)/eng/common/scripts/Verify-ChangeLog.ps1
       arguments: >
-        -PackageName ${{ parameters.PackageName }}
-        -ServiceDirectory ${{ coalesce(parameters.ServiceDirectory, parameters.ServiceName) }}
+        -PackageName '${{ parameters.PackageName }}'
+        -ServiceDirectory '${{ coalesce(parameters.ServiceDirectory, parameters.ServiceName) }}'
         -ForRelease $${{ parameters.ForRelease }}
       pwsh: true
       workingDirectory: $(Pipeline.Workspace)
     displayName: Verify ChangeLogEntry for ${{ parameters.PackageName }}
-    continueOnError: false
+    continueOnError: false