Skip to content

Commit

Permalink
Merge branch 'azure-sdk:main' into lel/azure-ai-vision-face-java
Browse files Browse the repository at this point in the history
  • Loading branch information
leareai committed May 6, 2024
2 parents 88ea2ed + 61b177c commit a19a745
Show file tree
Hide file tree
Showing 986 changed files with 15,919 additions and 10,033 deletions.
20 changes: 7 additions & 13 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,6 @@
# PRLabel: %Communication - Common
/sdk/communication/azure-communication-common/ @Azure/acs-identity-sdk @AikoBB @maximrytych-ms @mjafferi-msft

# PRLabel: %Communication - Network Traversal
/sdk/communication/azure-communication-networktraversal/ @ankitarorabit @minnieliu @Azure/azure-sdk-communication-code-reviewers

# PRLabel: %Communication - Phone Numbers
/sdk/communication/azure-communication-phonenumbers/ @miguhern @whisper6284 @RoyHerrod @danielav7

Expand Down Expand Up @@ -399,10 +396,10 @@
# ServiceOwners: @raedJarrar @jifems

# PRLabel: %DevCenter
/sdk/devcenter/ @sebrenna @mharlan
/sdk/devcenter/ @sebrenna

# ServiceLabel: %DevCenter
# ServiceOwners: @sebrenna @mharlan
# ServiceOwners: @sebrenna

# ServiceLabel: %Device Provisioning Service
# ServiceOwners: @nberdy
Expand Down Expand Up @@ -433,7 +430,7 @@

# ServiceLabel: %Event Grid
# AzureSdkOwners: @billwert
# ServiceOwners: @jfggdl
# ServiceOwners: @Kishp01 @ahamad-MS

# PRLabel: %Event Hubs
/sdk/eventhubs/ @conniey @anuchandy @lmolkova
Expand Down Expand Up @@ -561,7 +558,7 @@
# ServiceOwners: @ambhatna @savjani

# PRLabel: %OpenTelemetry
/sdk/monitor/azure-monitor-opentelemetry-exporter/ @trask @ramthi @heyams @jeanbisutti
/sdk/monitor/azure-monitor-opentelemetry-exporter/ @trask @ramthi @heyams @jeanbisutti @harsimar

# ServiceLabel: %Network
# ServiceOwners: @aznetsuppgithub
Expand Down Expand Up @@ -650,9 +647,6 @@
# ServiceLabel: %Redis Cache
# ServiceOwners: @yegu-ms

# ServiceLabel: %Relay
# ServiceOwners: @jfggdl

# PRLabel: %Remote Rendering
/sdk/remoterendering/ @MichaelZp0 @ChristopherManthei

Expand Down Expand Up @@ -799,13 +793,13 @@
/sdk/spring-experimental/ @chenrujun @netyyyy @saragluna @moarychan

# PRLabel: %Monitor - Spring
/sdk/spring/spring-cloud-azure-starter-monitor @jeanbisutti @trask @ramthi @heyams
/sdk/spring/spring-cloud-azure-starter-monitor @jeanbisutti @trask @ramthi @heyams @harsimar

# PRLabel: %Monitor - Spring
/sdk/spring/spring-cloud-azure-starter-monitor-test @jeanbisutti @trask @ramthi @heyams
/sdk/spring/spring-cloud-azure-starter-monitor-test @jeanbisutti @trask @ramthi @heyams @harsimar

# ServiceLabel: %Monitor - Spring
# AzureSdkOwners: @jeanbisutti @trask @ramthi @heyams
# AzureSdkOwners: @jeanbisutti @trask @ramthi @heyams @harsimar

# PRLabel: %azure-spring
/sdk/spring/spring-cloud-azure-appconfiguration-config*/ @mrm9084 @chenrujun @netyyyy @saragluna @moarychan
Expand Down
5 changes: 5 additions & 0 deletions .github/CODEOWNERS_baseline_errors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -267,3 +267,8 @@ ccmixpdevs is an invalid user. Ensure the user exists, is public member of Azure
ccmbpxpcrew is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
TiagoCrewGitHubIssues is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
ccmshowbackdevs is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
sagivf is not a public member of Azure.
Aviv-Yaniv is not a public member of Azure.
tmahmood-microsoft is not a public member of Azure.
Kishp01 is not a public member of Azure.
ahamad-MS is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
4 changes: 2 additions & 2 deletions .github/workflows/event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240311.2
--version 1.0.0-dev.20240502.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240311.2
--version 1.0.0-dev.20240502.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240311.2
--version 1.0.0-dev.20240502.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
7 changes: 6 additions & 1 deletion .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,12 @@
"mylocation",
"myloc",
"dari",
"hitel"
"hitel",
"AISERVICES",
"AICLIP",
"TLARGE",
"TBASE",
"TGIANT"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,22 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.14.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.15.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.11.20</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.11.21</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-jdk-httpclient</artifactId>
<version>1.0.0-beta.12</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;dependency} -->
<version>1.0.0-beta.13</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-vertx</artifactId>
<version>1.0.0-beta.17</version> <!-- {x-version-update;com.azure:azure-core-http-vertx;dependency} -->
<version>1.0.0-beta.18</version> <!-- {x-version-update;com.azure:azure-core-http-vertx;dependency} -->
</dependency>
<dependency>
<groupId>io.vertx</groupId>
Expand Down
14 changes: 7 additions & 7 deletions common/smoke-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,43 +88,43 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.48.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.49.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.14.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.15.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-tracing-opentelemetry</artifactId>
<version>1.0.0-beta.45</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
<version>1.0.0-beta.46</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.11.20</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.11.21</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>2.9.3</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
<version>2.9.4</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.58.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
<version>4.59.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.12.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<version>1.12.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
</dependency>

<dependency>
Expand Down
36 changes: 18 additions & 18 deletions eng/emitter-package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions eng/emitter-package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"main": "dist/src/index.js",
"dependencies": {
"@azure-tools/typespec-java": "0.15.14"
"@azure-tools/typespec-java": "0.15.15"
},
"devDependencies": {
"@typespec/versioning": "0.55.0",
"@azure-tools/typespec-client-generator-core": "0.41.6",
"@typespec/http": "0.55.0",
"@typespec/openapi": "0.55.0",
"@azure-tools/typespec-client-generator-core": "0.41.8",
"@typespec/rest": "0.55.0",
"@typespec/compiler": "0.55.0",
"@typespec/openapi": "0.55.0",
"@azure-tools/typespec-azure-core": "0.41.0",
"@typespec/versioning": "0.55.0",
"@typespec/http": "0.55.0",
"@azure-tools/typespec-azure-resource-manager": "0.41.0",
"@azure-tools/typespec-autorest": "0.41.1"
}
Expand Down
33 changes: 25 additions & 8 deletions eng/mgmt/automation/generate_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import subprocess
import urllib.parse
from typing import Tuple, List, Union
from typespec_utils import validate_tspconfig

pwd = os.getcwd()
#os.chdir(os.path.abspath(os.path.dirname(sys.argv[0])))
Expand Down Expand Up @@ -77,7 +78,12 @@ def generate(
)
logging.info(command)
if os.system(command) != 0:
logging.error('[GENERATE] Autorest fail')
error_message = ('[GENERATE][Error] Code generation failed.\n'
'Please first check if the failure happens only to Java automation, or for all SDK automations.\n'
'If it happens for all SDK automations, please double check your Swagger, and check whether there is errors in ModelValidation and LintDiff.\n'
'If it happens to Java alone, you can open an issue to https://github.com/Azure/autorest.java/issues. Please include the link of this Pull Request in the issue.')
logging.error(error_message)
print(error_message, file=sys.stderr)
return False

group = GROUP_ID
Expand All @@ -93,7 +99,10 @@ def compile_package(sdk_root, module) -> bool:
if os.system(
'mvn --no-transfer-progress clean verify -f {0}/pom.xml -Dmaven.javadoc.skip -Dgpg.skip -DskipTestCompile -Djacoco.skip -Drevapi.skip -pl {1}:{2} -am'.format(
sdk_root, GROUP_ID, module)) != 0:
logging.error('[COMPILE] Maven build fail')
error_message = ('[COMPILE] Maven build fail.\n'
'You can inquire in "Language - Java" Teams channel. Please include the link of this Pull Request in the query.')
logging.error(error_message)
print(error_message, file=sys.stderr)
return False
return True

Expand Down Expand Up @@ -321,27 +330,35 @@ def generate_typespec_project(
tsp_project,
re.IGNORECASE
)

tspconfig_valid = True
if url_match:
# generate from remote url
cmd = ['npx', 'tsp-client', 'init', '--debug',
'--tsp-config', tsp_project]
else:
# sdk automation
tsp_dir = os.path.join(spec_root, tsp_project) if spec_root else tsp_project
tspconfig_valid = validate_tspconfig(tsp_dir)
repo = remove_prefix(repo_url, 'https://github.com/')
cmd = ['npx', 'tsp-client', 'init', '--debug',
'--tsp-config', tsp_dir,
'--commit', head_sha,
'--repo', repo,
'--local-spec-repo', tsp_dir]
check_call(cmd, sdk_root)

sdk_folder = find_sdk_folder(sdk_root)
logging.info('SDK folder: ' + sdk_folder)
if sdk_folder:
succeeded = True
if tspconfig_valid:
check_call(cmd, sdk_root)

sdk_folder = find_sdk_folder(sdk_root)
logging.info('SDK folder: ' + sdk_folder)
if sdk_folder:
succeeded = True
except subprocess.CalledProcessError as error:
logging.error(f'tsp-client init fail: {error}')
error_message = (f'[GENERATE][Error] Code generation failed. tsp-client init fails: {error}\n'
'If TypeSpec Validation passes, you can open an issue to https://github.com/Azure/autorest.java/issues. Please include the link of this Pull Request in the issue.')
logging.error(error_message)
print(error_message, file=sys.stderr)

if succeeded:
# check require_sdk_integration
Expand Down
2 changes: 1 addition & 1 deletion eng/mgmt/automation/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pip3 install --upgrade PyYAML requests 2>&1

# install tsp-client globally (local install may interfere with tooling)
echo Install tsp-client
npm install -g @azure-tools/typespec-client-generator-cli
npm install -g @azure-tools/typespec-client-generator-cli 2>&1

cat << EOF > $2
{"envs": {"PATH": "$JAVA_HOME_11_X64/bin:$PATH", "JAVA_HOME": "$JAVA_HOME_11_X64"}}
Expand Down
Loading

0 comments on commit a19a745

Please sign in to comment.