Skip to content

Commit 9f208b7

Browse files
authored
Merge branch 'Azure:main' into main
2 parents 1bbdc8e + 6f7e078 commit 9f208b7

File tree

3,002 files changed

+292601
-448382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,002 files changed

+292601
-448382
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
/sdk/monitor/azure-monitor-ingestion/ @pvaneck @Azure/azure-sdk-write-monitor-data-plane
180180

181181
# PRLabel: %Monitor
182-
/sdk/monitor/azure-monitor-query/ @pvaneck @Azure/azure-sdk-write-monitor-data-plane
182+
/sdk/monitor/azure-monitor-query/ @Azure/azure-sdk-write-monitor-query-logs
183183

184184
# PRLabel: %Monitor
185185
/sdk/monitor/azure-monitor-querymetrics/ @Azure/azure-sdk-write-monitor-query-metrics

.github/workflows/azure-sdk-tools.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v2
1515

16-
- name: Set up Python 3.11
16+
- name: Set up Python 3.13
1717
uses: actions/setup-python@v4
1818
with:
19-
python-version: 3.11
19+
python-version: 3.13
2020

2121
- name: Install azure-sdk-tools
2222
run: |

.vscode/cspell.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,9 +558,9 @@
558558
]
559559
},
560560
{
561-
"filename": "doc/dev/test_proxy_migration_guide.md",
561+
"filename": "doc/dev/credscan_process.md",
562562
"words": [
563-
"pytestmarkparametrize"
563+
"CSCAN"
564564
]
565565
},
566566
{

doc/dev/credscan_process.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,9 @@ Suppressing string values will disable warnings no matter where the string comes
6767
and inconvenient for lengthy strings. Suppressing warnings in a file is convenient for fake credential files, but
6868
strings in that file will still trigger warnings if present in another unsuppressed file.
6969

70-
## Correct baselined warnings
71-
72-
In addition to active warning that appear in the [python - aggregate-reports][aggregate_reports] pipeline ouput, there
73-
are also CredScan warnings that have been suppressed in [eng/python.gdnbaselines][baseline]. This file is a snapshot of
74-
the active warnings at one point in time; CredScan won't re-raise warnings that have been recorded here.
75-
76-
Ultimately, we hope to remove this baseline file from the repository entirely. If you see any warnings for a package
77-
that you own in this file, please remove a few at a time from the file so that CredScan will output these warnings in
78-
the pipeline. Then, resolve them following the steps from the [Correct active warnings](#correct-active-warnings)
79-
section of this guide.
80-
8170

8271
[aggregate_reports]: https://dev.azure.com/azure-sdk/internal/_build?definitionId=1401&_a=summary
8372
[aggregate_reports_output]: https://dev.azure.com/azure-sdk/internal/_build/results?buildId=1411446&view=logs&j=9e400fad-ff47-5b38-f9dc-cae2431972da&t=8613334a-c306-55ea-63ff-80c6e8e0a0ca
84-
[baseline]: https://github.com/Azure/azure-sdk-for-python/blob/main/eng/python.gdnbaselines
8573
[ci_scan_output]: https://dev.azure.com/azure-sdk/public/_build/results?buildId=1426258&view=logs&jobId=b70e5e73-bbb6-5567-0939-8415943fadb9&j=bc67675d-56bf-581f-e0a2-208848ba68ca&t=7eee3a58-6120-518b-7fcb-7e943712aa81
8674
[credscan_doc]: https://aka.ms/credscan
8775
[devops_doc]: https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/413/Credential-Scan-Step-in-Pipeline

doc/dev/mgmt/generating-integration-test.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,7 @@ You can rearrange sequence or disable particular tests.
9696
## Running Test
9797

9898
To run tests, refer to the documentation at
99-
[/doc/dev/mgmt/tests.md](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/mgmt/tests.md). Most test
100-
suites in the Azure SDK have been migrated to use the Azure SDK test proxy, but some libraries that have inactive tests
101-
may still be using an older, deprecated system. The
102-
[test proxy migration guide](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/test_proxy_migration_guide.md)
103-
describes the differences between the systems and their requirements.
99+
[/doc/dev/mgmt/tests.md](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/mgmt/tests.md).
104100

105101
## Fixing Test
106102

doc/dev/mgmt/multiapi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ o
112112

113113
If this is the same API version, since they will be packed together that's ok (for instance [compute](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2019-03-01/compute.json) and [runcommands](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2019-03-01/runCommands.json) shares `VirtualMachines_` but exists always in the same API version)
114114

115-
If this is not the same API version, then we need to bend the rules a little: we need to understand the intent, and decide which API version we use as folder to ship both (example: [ACR 2019-05-01](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json) and [registry build 2019-06-01-preview](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview) are shipped as [2019-06-01-preview](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview) because they share `BuildRegistry_` operation group).
115+
If this is not the same API version, then we need to bend the rules a little: we need to understand the intent, and decide which API version we use as folder to ship both (example: [ACR 2019-05-01](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2019-05-01/containerregistry.json) and [registry build 2019-06-01-preview](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview) were shipped as [2019-06-01-preview](https://github.com/Azure/azure-sdk-for-python/tree/24e4a701802b82832d97f125c6c96567c8e4448e/sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview) because they share `BuildRegistry_` operation group).
116116

117117
## Possible improvements
118118

doc/dev/mgmt/tests.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ This simple test creates a resource group and checks that its name is assigned c
190190

191191
Notes:
192192
1. This test inherits all necessary behavior for HTTP recording and playback described previously in this document from its `AzureMgmtRecordedTestCase` superclass. You don't need to do anything special to implement it.
193-
2. The `get_resource_name()` helper method of `AzureMgmtRecordedTestCase` creates a pseudorandom name based on the parameter and the names of the test file and method. This ensures that the name generated is the same for each run of the same test, ensuring reproducability and preventing name collisions if the tests are run live and the same parameter is used from several different tests.
193+
2. The `get_resource_name()` helper method of `AzureMgmtRecordedTestCase` creates a pseudorandom name based on the parameter and the names of the test file and method. This ensures that the name generated is the same for each run of the same test, ensuring reproducibility and preventing name collisions if the tests are run live and the same parameter is used from several different tests.
194194
3. The `create_mgmt_client()` helper method of `AzureMgmtRecordedTestCase` creates a client object using the credentials from `mgmt_settings_fake.py` or `mgmt_settings_real.py` as appropriate, with some checks to make sure it's created successfully and cause the unit test to fail if not. You should use it for any clients you create.
195195
4. While the test cleans up the resource group it creates, you will need to manually delete any resources you've created independent of the test framework. But if you need something like a resource group as a prerequisite for what you're actually trying to test, you should use a "preparer" as demonstrated in the following two examples. Preparers will create and clean up helper resources for you.
196196

@@ -211,7 +211,7 @@ class TestMgmtSearch(AzureMgmtRecordedTestCase):
211211
@ResourceGroupPreparer()
212212
@recorded_by_proxy
213213
def test_search_services(self, resource_group, location):
214-
account_name = self.get_resource_name(''ptvstestsearch')
214+
account_name = self.get_resource_name('search')
215215

216216
service = self.client.services.begin_create_or_update(
217217
resource_group.name,
@@ -327,7 +327,7 @@ class TestMgmtSearch(AzureMgmtRecordedTestCase):
327327
@ResourceGroupPreparer(client_kwargs={'base_url':_CUSTOM_ENDPOINT})
328328
@recorded_by_proxy
329329
def test_search_services(self, resource_group, location):
330-
account_name = self.get_resource_name(''ptvstestsearch')
330+
account_name = self.get_resource_name('search')
331331

332332
service = self.client.services.begin_create_or_update(
333333
resource_group.name,
@@ -357,5 +357,5 @@ class TestMgmtSearch(AzureMgmtRecordedTestCase):
357357
[dev_setup]: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/dev_setup.md
358358
[devtools_testutils]: https://github.com/Azure/azure-sdk-for-python/tree/main/tools/azure-sdk-tools/devtools_testutils
359359
[mgmt_settings_fake]: https://github.com/Azure/azure-sdk-for-python/blob/main/tools/azure-sdk-tools/devtools_testutils/mgmt_settings_fake.py
360-
[testproxy]: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/test_proxy_migration_guide.md
360+
[testproxy]: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/tests.md#write-or-run-tests
361361
[pytest]: https://docs.pytest.org/en/latest/

0 commit comments

Comments
 (0)