Skip to content

Commit

Permalink
Merge branch 'Azure:main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Eagle3386 authored Oct 16, 2024
2 parents 65e72b1 + 59f2ec4 commit 002f947
Show file tree
Hide file tree
Showing 1,038 changed files with 9,214 additions and 9,905 deletions.
24 changes: 16 additions & 8 deletions .github/workflows/event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,21 @@ jobs:

- name: Process Action Event
run: |
cat > payload.json << 'EOF'
${{ toJson(github.event) }}
EOF
github-event-processor ${{ github.event_name }} payload.json
github-event-processor ${{ github.event_name }} ${{ github.event_path }}
shell: bash
env:
# This is a temporary secret generated by github
# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
LABEL_SERVICE_API_KEY: ${{ env.LABEL_SERVICE_API_KEY }}

- name: Archive github event data
uses: actions/upload-artifact@v4
if: always()
with:
name: event
path: ${{ github.event_path }}

event-handler:
permissions:
issues: write
Expand Down Expand Up @@ -143,12 +147,16 @@ jobs:

- name: Process Action Event
run: |
cat > payload.json << 'EOF'
${{ toJson(github.event) }}
EOF
github-event-processor ${{ github.event_name }} payload.json
github-event-processor ${{ github.event_name }} ${{ github.event_path }}
shell: bash
env:
# This is a temporary secret generated by github
# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Archive github event data
uses: actions/upload-artifact@v4
if: always()
with:
name: event
path: ${{ github.event_path }}
42 changes: 14 additions & 28 deletions .github/workflows/scheduled-event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,76 +69,62 @@ jobs:
- name: Close Stale Issues Scheduled Event
if: github.event.schedule == '0 1 * * *'
run: |
cat > payload.json << 'EOF'
${{ toJson(github.event) }}
EOF
github-event-processor ${{ github.event_name }} payload.json CloseStaleIssues
github-event-processor ${{ github.event_name }} ${{ github.event_path }} CloseStaleIssues
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Identify Stale PullRequests Scheduled Event
if: github.event.schedule == '0 5 * * FRI'
run: |
cat > payload.json << 'EOF'
${{ toJson(github.event) }}
EOF
github-event-processor ${{ github.event_name }} payload.json IdentifyStalePullRequests
github-event-processor ${{ github.event_name }} ${{ github.event_path }} IdentifyStalePullRequests
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Close Stale PullRequests Scheduled Event
if: github.event.schedule == '30 2,8,14,20 * * *'
run: |
cat > payload.json << 'EOF'
${{ toJson(github.event) }}
EOF
github-event-processor ${{ github.event_name }} payload.json CloseStalePullRequests
github-event-processor ${{ github.event_name }} ${{ github.event_path }} CloseStalePullRequests
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Identify Stale Issues Scheduled Event
if: github.event.schedule == '30 3,9,15,21 * * *'
run: |
cat > payload.json << 'EOF'
${{ toJson(github.event) }}
EOF
github-event-processor ${{ github.event_name }} payload.json IdentifyStaleIssues
github-event-processor ${{ github.event_name }} ${{ github.event_path }} IdentifyStaleIssues
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Close Addressed Issues Scheduled Event
if: github.event.schedule == '30 4,10,16,22 * * *'
run: |
cat > payload.json << 'EOF'
${{ toJson(github.event) }}
EOF
github-event-processor ${{ github.event_name }} payload.json CloseAddressedIssues
github-event-processor ${{ github.event_name }} ${{ github.event_path }}
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Lock Closed Issues Scheduled Event
if: github.event.schedule == '30 5,11,17,23 * * *'
run: |
cat > payload.json << 'EOF'
${{ toJson(github.event) }}
EOF
github-event-processor ${{ github.event_name }} payload.json LockClosedIssues
github-event-processor ${{ github.event_name }} ${{ github.event_path }} LockClosedIssues
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Enforce Max Life of Issues Scheduled Event
if: github.event.schedule == '0 18 * * 1,3,5'
run: |
cat > payload.json << 'EOF'
${{ toJson(github.event) }}
EOF
github-event-processor ${{ github.event_name }} payload.json EnforceMaxLifeOfIssues
github-event-processor ${{ github.event_name }} ${{ github.event_path }} EnforceMaxLifeOfIssues
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Archive github event data
uses: actions/upload-artifact@v4
if: always()
with:
name: event
path: ${{ github.event_path }}
6 changes: 3 additions & 3 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
<PackageReference Update="Azure.Messaging.EventGrid" Version="4.17.0" />
<PackageReference Update="Azure.Messaging.EventHubs.Processor" Version="5.11.3" />
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.18.2" />
<PackageReference Update="Azure.ResourceManager.Compute" Version="1.2.0" />
<PackageReference Update="Azure.ResourceManager.Compute" Version="1.7.0-beta.1" />
<PackageReference Update="Azure.ResourceManager.CognitiveServices" Version="1.3.0" />
<PackageReference Update="Azure.ResourceManager.KeyVault" Version="1.1.0" />
<PackageReference Update="Azure.ResourceManager.ManagedServiceIdentities" Version="1.1.0" />
Expand All @@ -269,7 +269,7 @@
<PackageReference Update="Azure.ResourceManager.Kubernetes" Version="1.0.0-beta.3" />
<PackageReference Update="Azure.ResourceManager.KubernetesConfiguration" Version="1.2.0-beta.1" />
<PackageReference Update="Azure.ResourceManager.ExtendedLocations" Version="1.1.0-beta.1" />
<PackageReference Update="Azure.ResourceManager.EventHubs" Version="1.0.0" />
<PackageReference Update="Azure.ResourceManager.EventHubs" Version="1.2.0-beta.1" />
<PackageReference Update="Azure.ResourceManager.ContainerRegistry" Version="1.1.0" />
<PackageReference Update="Azure.Search.Documents" Version="11.2.0" />
<PackageReference Update="Azure.Security.KeyVault.Keys" Version="4.6.0" />
Expand Down Expand Up @@ -325,7 +325,7 @@
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.1.10" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
<PackageReference Update="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
Expand Down
34 changes: 4 additions & 30 deletions eng/pipelines/templates/jobs/live.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,28 +132,12 @@ jobs:
displayName: Set TestResources Location
- ${{ if parameters.DeployTestResources }}:
- ${{ if parameters.TestResourceDirectories }}:
- ${{ each directory in parameters.TestResourceDirectories }}:
- template: /eng/common/TestResources/deploy-test-resources.yml
parameters:
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
ServiceDirectory: '${{ directory }}'
TestResourcesDirectory: '$(TestResourcesDirectory)'
SubscriptionConfiguration: $(SubscriptionConfiguration)
ArmTemplateParameters: $(ArmTemplateParameters)
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}
EnvVars:
Pool: $(Pool)
${{ insert }}: ${{ parameters.EnvVars }}
- ${{ if not(parameters.TestResourceDirectories) }}:
- ${{ each directory in coalesce(parameters.TestResourceDirectories, split(parameters.ServiceDirectory, '|')) }}:
- template: /eng/common/TestResources/deploy-test-resources.yml
parameters:
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
ServiceDirectory: '${{ directory }}'
TestResourcesDirectory: '$(TestResourcesDirectory)'
SubscriptionConfiguration: $(SubscriptionConfiguration)
ArmTemplateParameters: $(ArmTemplateParameters)
Expand Down Expand Up @@ -242,20 +226,10 @@ jobs:
${{ var.key }}: ${{ var.value }}
- ${{ if parameters.DeployTestResources }}:
- ${{ if parameters.TestResourceDirectories }}:
- ${{ each directory in parameters.TestResourceDirectories }}:
- template: /eng/common/TestResources/remove-test-resources.yml
parameters:
ServiceDirectory: '${{ directory }}'
SubscriptionConfiguration: $(SubscriptionConfiguration)
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
SubscriptionConfigurationFilePaths: ${{ parameters.CloudConfig.SubscriptionConfigurationFilePaths }}

- ${{ if not(parameters.TestResourceDirectories) }}:
- ${{ each directory in coalesce(parameters.TestResourceDirectories, split(parameters.ServiceDirectory, '|')) }}:
- template: /eng/common/TestResources/remove-test-resources.yml
parameters:
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
ServiceDirectory: '${{ directory }}'
SubscriptionConfiguration: $(SubscriptionConfiguration)
UseFederatedAuth: ${{ parameters.UseFederatedAuth }}
ServiceConnection: ${{ parameters.CloudConfig.ServiceConnection }}
Expand Down
26 changes: 5 additions & 21 deletions eng/pipelines/templates/stages/archetype-sdk-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,11 @@ parameters:
type: object
default:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Preview:
ServiceConnection: azure-sdk-tests-preview
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePreviewMsft.json
Canary:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
Location: 'eastus2euap'
# Canary regions are currently not supported in TME so disabling for now
# Canary:
# Location: 'eastus2euap'
UsGov:
ServiceConnection: usgov_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureUsGovMsft.json
China:
ServiceConnection: china_azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzureChinaMsft.json
- name: MatrixConfigs
type: object
default:
Expand Down Expand Up @@ -122,7 +107,6 @@ parameters:
extends:
template: /eng/pipelines/templates/stages/1es-redirect.yml
parameters:
UseOfficial: false
oneESTemplateTag: ${{ parameters.oneESTemplateTag }}
stages:
- ${{ each cloud in parameters.CloudConfig }}:
Expand Down Expand Up @@ -175,8 +159,8 @@ extends:
- ${{ parameters.MatrixReplace }}
CloudConfig:
SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
ServiceConnection: ${{ cloud.value.ServiceConnection }}
ServiceConnection: ${{ coalesce(cloud.value.ServiceConnection, lower(format('azure-sdk-tests-{0}', cloud.key))) }}
SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }}
SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}
Location: ${{ coalesce(parameters.Location, cloud.value.Location) }}
Location: ${{ coalesce(cloud.value.Location, parameters.Location) }}
Cloud: ${{ cloud.key }}
6 changes: 3 additions & 3 deletions samples/linecounter/LineCounter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Messaging.EventGrid" Version="4.21.0" />
<PackageReference Include="Azure.Messaging.EventHubs" Version="5.10.0" />
<PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.10.0" />
<PackageReference Include="Azure.Messaging.EventHubs" Version="5.11.5" />
<PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.11.5" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.0" />
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.1" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0-rc.2.23479.6" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.0.0-beta.8" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "net",
"TagPrefix": "net/apimanagement/Azure.ResourceManager.ApiManagement",
"Tag": "net/apimanagement/Azure.ResourceManager.ApiManagement_0cc2a6dd7d"
"Tag": "net/apimanagement/Azure.ResourceManager.ApiManagement_888f981359"
}
2 changes: 1 addition & 1 deletion sdk/appconfiguration/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ extends:
template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
parameters:
ServiceDirectory: appconfiguration
SupportedClouds: 'Public,Preview,UsGov'
SupportedClouds: 'Public,UsGov'
6 changes: 0 additions & 6 deletions sdk/communication/Azure.Communication.AlphaIds/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@ extends:
CloudConfig:
Public:
SubscriptionConfigurations:
- $(sub-config-azure-cloud-test-resources)
- $(sub-config-communication-services-cloud-test-resources-common)
- $(sub-config-communication-services-cloud-test-resources-net)
Int:
SubscriptionConfigurations:
- $(sub-config-communication-int-test-resources-common)
- $(sub-config-communication-int-test-resources-net)
Clouds: Public,Int
TestResourceDirectories:
- communication/test-resources/
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,9 @@ extends:
Project: Azure.Communication.CallAutomation
CloudConfig:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurations:
- $(sub-config-communication-services-cloud-test-resources-common)
- $(sub-config-communication-services-cloud-test-resources-net)
Clouds: Public
TestResourceDirectories:
- communication/
EnvVars:
Expand Down
4 changes: 0 additions & 4 deletions sdk/communication/Azure.Communication.CallingServer/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,9 @@ extends:
Project: Azure.Communication.CallingServer
CloudConfig:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurations:
- $(sub-config-communication-services-cloud-test-resources-common)
- $(sub-config-communication-services-cloud-test-resources-net)
Clouds: Public
TestResourceDirectories:
- communication/
EnvVars:
Expand Down
4 changes: 0 additions & 4 deletions sdk/communication/Azure.Communication.Chat/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@ extends:
Project: Azure.Communication.Chat
CloudConfig:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurations:
- $(sub-config-communication-services-cloud-test-resources-common)
- $(sub-config-communication-services-cloud-test-resources-net)
Clouds: Public
TestResourceDirectories:
- communication/
19 changes: 0 additions & 19 deletions sdk/communication/Azure.Communication.Email/tests.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
trigger: none

parameters:
- name: runOnlyPPE
displayName: "Run only the PPE stage"
type: boolean
default: false

extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
parameters:
Expand All @@ -14,20 +8,7 @@ extends:
CloudConfig:
Public:
SubscriptionConfigurations:
- $(sub-config-azure-cloud-test-resources)
- $(sub-config-communication-services-cloud-test-resources-common)
- $(sub-config-communication-services-cloud-test-resources-net)
Int:
SubscriptionConfigurations:
- $(sub-config-communication-int-test-resources-common)
- $(sub-config-communication-int-test-resources-net)
PPE:
SubscriptionConfigurations:
- $(sub-config-communication-ppe-test-resources-common)
- $(sub-config-communication-ppe-test-resources-net)
${{ if eq(parameters.runOnlyPPE, true) }}:
Clouds: PPE
${{ if eq(parameters.runOnlyPPE, false) }}:
Clouds: Public,PPE,Int
TestResourceDirectories:
- communication/Azure.Communication.Email/
4 changes: 0 additions & 4 deletions sdk/communication/Azure.Communication.Identity/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@ extends:
Project: Azure.Communication.Identity
CloudConfig:
Public:
ServiceConnection: azure-sdk-tests
SubscriptionConfigurationFilePaths:
- eng/common/TestResources/sub-config/AzurePublicMsft.json
SubscriptionConfigurations:
- $(sub-config-communication-services-cloud-test-resources-common)
- $(sub-config-communication-services-cloud-test-resources-net)
Clouds: Public
TestResourceDirectories:
- communication/
Loading

0 comments on commit 002f947

Please sign in to comment.