Moary/test monitor

.github/CODEOWNERS

@@ -458,6 +458,10 @@
 # PRLabel: %Event Hubs
 /sdk/eventhubs/microsoft-azure-eventhubs/            @sjkwak
 
+# ServiceLabel: %Cognitive - Face
+# PRLabel: %Cognitive - Face
+/sdk/face/azure-ai-vision-face/               @leareai
+
 # ServiceLabel: %Functions
 # ServiceOwners:                                     @ahmedelnably @fabiocav
 
@@ -864,13 +868,14 @@
 # ######## Eng Sys ########
 
 /eng/                                                @hallipr @weshaggard @benbp @JimSuplizio
+/eng/automation/                                     @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978 @hallipr @weshaggard @benbp @JimSuplizio
 /eng/bomgenerator/                                   @vcolin7 @alzimmermsft @srnagar @jonathangiles
 /eng/code-quality-reports/                           @mssfang @JonathanGiles @alzimmermsft @srnagar
 /eng/common/                                         @Azure/azure-sdk-eng
-/eng/mgmt/                                           @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978 @hallipr @weshaggard @benbp @JimSuplizio
 /eng/spotbugs-aggregate-report/                      @srnagar @JonathanGiles
 /eng/versioning/                                     @alzimmermsft @samvaity @g2vinay @JimSuplizio
 /eng/versioning/external_dependencies.txt            @alzimmermsft @samvaity @g2vinay @jonathangiles @rujche @netyyyy @saragluna @moarychan
+/.github/workflows/                                  @Azure/azure-sdk-eng
 
 # Removing owners for these files to not require codeowner approval for changes to them given they are shared with project
 /eng/versioning/version_client.txt

.github/workflows/event-processor.yml

@@ -58,7 +58,7 @@ jobs:
         run: >
           dotnet tool install
           Azure.Sdk.Tools.GitHubEventProcessor
-          --version 1.0.0-dev.20240610.2
+          --version 1.0.0-dev.20240708.1
           --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
           --global
         shell: bash
@@ -114,7 +114,7 @@ jobs:
         run: >
           dotnet tool install
           Azure.Sdk.Tools.GitHubEventProcessor
-          --version 1.0.0-dev.20240610.2
+          --version 1.0.0-dev.20240708.1
           --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
           --global
         shell: bash

.github/workflows/scheduled-event-processor.yml

@@ -39,7 +39,7 @@ jobs:
         run: >
           dotnet tool install
           Azure.Sdk.Tools.GitHubEventProcessor
-          --version 1.0.0-dev.20240610.2
+          --version 1.0.0-dev.20240708.1
           --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
           --global
         shell: bash

.vscode/cspell.json

@@ -77,7 +77,6 @@
     "sdk/appconfiguration/azure-spring-cloud-feature-management-web/**",
     "sdk/appconfiguration/azure-spring-cloud-feature-management/**",
     "sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/**",
-    "sdk/appconfiguration/azure-data-appconfiguration/**",
     "sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/**",
     "sdk/boms/azure-sdk-bom/**",
     "sdk/boms/azure-sdk-template-bom/**",

common/smoke-tests/pom.xml

@@ -136,13 +136,13 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>
-      <version>5.18.4</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
+      <version>5.18.5</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-      <version>1.19.4</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
+      <version>1.19.5</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
     </dependency>
 
     <dependency>

eng/mgmt/automation/generate.py → eng/automation/generate.py

@@ -304,6 +304,33 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
         }
 
 
+def update_changelog_version(sdk_root:str, output_folder:str, current_version:str):
+    pwd = os.getcwd()
+    try:
+        os.chdir(sdk_root)
+        changelog_file = os.path.join(output_folder, "CHANGELOG.md")
+        if os.path.exists(changelog_file):
+            with open(changelog_file, "r") as fin:
+                changelog_str = fin.read()
+            logging.info("[CHANGELOG][Version] Update changelog latest version")
+            version_pattern = "^## (\d+\.\d+\.\d+(?:-[\w\d\.]+)?) \((?P<date>.*?)\)"
+
+            changelog_str = re.sub(
+                pattern = version_pattern,
+                repl = f"## {current_version} (\\g<date>)",
+                string = changelog_str,
+                count = 1,
+                flags = re.M
+            )
+            with open(changelog_file, "w") as fout:
+                fout.write(changelog_str)
+
+            logging.info("[Changelog][Success] Updated changelog latest version")
+        else:
+            logging.info("[Changelog][Skip] Cannot find changelog file under the given output folder")
+    finally:
+        os.chdir(pwd)
+
 def main():
     (parser, args) = parse_args()
     args = vars(args)
@@ -332,6 +359,7 @@ def main():
         update_parameters(None)
         output_folder = OUTPUT_FOLDER_FORMAT.format(service)
         update_version(sdk_root, output_folder)
+        update_changelog_version(sdk_root, output_folder, current_version)
     else:
         if not args.get("readme"):
             parser.print_help()
@@ -374,7 +402,7 @@ def main():
                 try:
                     os.chdir(sdk_root)
                     os.system(
-                        "git add eng/versioning eng/mgmt pom.xml {0} {1}".format(
+                        "git add eng/versioning eng/automation pom.xml {0} {1}".format(
                             CI_FILE_FORMAT.format(service), POM_FILE_FORMAT.format(service)
                         )
                     )

eng/mgmt/automation/generate_data.py → eng/automation/generate_data.py

@@ -34,6 +34,7 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
     repo_url: str = config["repoHttpsUrl"]
     breaking: bool = False
     changelog: str = ""
+    clean_sdk_folder_succeeded = False
 
     succeeded, require_sdk_integration, sdk_folder, service, module = generate_typespec_project(
         tsp_project, sdk_root, spec_root, head_sha, repo_url
@@ -54,6 +55,8 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
         if require_sdk_integration:
             update_service_files_for_new_lib(sdk_root, service, GROUP_ID, module)
             update_root_pom(sdk_root, service)
+        if clean_sdk_folder_succeeded:
+            current_version = DEFAULT_VERSION
 
         # compile
         succeeded = compile_package(sdk_root, GROUP_ID, module)
@@ -74,7 +77,8 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
                 succeeded, require_sdk_integration, sdk_folder, service, module = generate_typespec_project(
                     tsp_project, sdk_root, spec_root, head_sha, repo_url
                 )
-                stable_version, current_version = set_or_default_version(sdk_root, GROUP_ID, module)
+                stable_version, _= set_or_default_version(sdk_root, GROUP_ID, module)
+                current_version = DEFAULT_VERSION
                 if require_sdk_integration:
                     update_service_files_for_new_lib(sdk_root, service, GROUP_ID, module)
                     update_root_pom(sdk_root, service)

eng/mgmt/automation/generate_utils.py → eng/automation/generate_utils.py

@@ -146,7 +146,7 @@ def generate_changelog_and_breaking_change(
 ) -> Tuple[bool, str]:
     logging.info("[CHANGELOG] changelog jar: {0} -> {1}".format(old_jar, new_jar))
     stdout = subprocess.run(
-        'mvn --no-transfer-progress clean compile exec:java -q -f {0}/eng/mgmt/changelog/pom.xml -DOLD_JAR="{1}" -DNEW_JAR="{2}"'.format(
+        'mvn --no-transfer-progress clean compile exec:java -q -f {0}/eng/automation/changelog/pom.xml -DOLD_JAR="{1}" -DNEW_JAR="{2}"'.format(
             sdk_root, old_jar, new_jar
         ),
         stdout=subprocess.PIPE,

eng/mgmt/automation/generation.yml → eng/automation/generation.yml

@@ -64,14 +64,14 @@ jobs:
     - bash: |
         java -version
         set -x
-        ./eng/mgmt/automation/generate.py --tsp-config "$(TSP_CONFIG)" --version "$(VERSION)" --auto-commit-external-change --user-name "azure-sdk" --user-email "[email protected]"
+        ./eng/automation/generate.py --tsp-config "$(TSP_CONFIG)" --version "$(VERSION)" --auto-commit-external-change --user-name "azure-sdk" --user-email "[email protected]"
       displayName: Generation from TypeSpec
       condition: ${{ eq(parameters.RELEASE_TYPE, 'TypeSpec') }}
 
     - bash: |
         java -version
         set -x
-        ./eng/mgmt/automation/generate.py --readme "$(README)" --tag "$(TAG)" --autorest-options="$(AUTOREST_OPTIONS)" --service "$(SERVICE)" --version "$(VERSION)" --suffix "$(SUFFIX)" --auto-commit-external-change --user-name "azure-sdk" --user-email "[email protected]"
+        ./eng/automation/generate.py --readme "$(README)" --tag "$(TAG)" --autorest-options="$(AUTOREST_OPTIONS)" --service "$(SERVICE)" --version "$(VERSION)" --suffix "$(SUFFIX)" --auto-commit-external-change --user-name "azure-sdk" --user-email "[email protected]"
       displayName: Generation from Swagger
       condition: ${{ eq(parameters.RELEASE_TYPE, 'Swagger') }}
 

eng/mgmt/automation/generation_data.yml → eng/automation/generation_data.yml

@@ -33,7 +33,7 @@ steps:
 - bash: |
     export PATH=$JAVA_HOME_11_X64/bin:$PATH
     java -version
-    ./eng/mgmt/automation/generate_data.py --readme="$(README)" --spec-readme="$(SPEC_README)" --input-file="$(INPUT_FILE)" --service="$(SERVICE)" --module="$(MODULE)" --security="$(SECURITY)" --security-scopes="$(SECURITY_SCOPES)" --title="$(TITLE)"
+    ./eng/automation/generate_data.py --readme="$(README)" --spec-readme="$(SPEC_README)" --input-file="$(INPUT_FILE)" --service="$(SERVICE)" --module="$(MODULE)" --security="$(SECURITY)" --security-scopes="$(SECURITY_SCOPES)" --title="$(TITLE)"
   displayName: Generation
 
 - template: /eng/common/pipelines/templates/steps/create-pull-request.yml

eng/mgmt/automation/parameters.py → eng/automation/parameters.py

@@ -15,9 +15,9 @@
 MAVEN_HOST = "https://repo1.maven.org/maven2"
 MAVEN_URL = MAVEN_HOST + "/{group_id}/{artifact_id}/{version}/{artifact_id}-{version}.jar"
 
-SDK_ROOT = "../../../"  # related to file dir
+SDK_ROOT = "../../"  # related to file dir
 AUTOREST_CORE_VERSION = "3.9.7"
-AUTOREST_JAVA = "@autorest/[email protected].32"
+AUTOREST_JAVA = "@autorest/[email protected].34"
 DEFAULT_VERSION = "1.0.0-beta.1"
 GROUP_ID = "com.azure.resourcemanager"
 API_SPECS_FILE = "api-specs.yaml"

eng/mgmt/automation/sdk_generate.py → eng/automation/sdk_generate.py

@@ -288,7 +288,7 @@ def main():
                 try:
                     os.chdir(sdk_root)
                     os.system(
-                        "git add eng/versioning eng/mgmt pom.xml {0} {1}".format(
+                        "git add eng/versioning eng/automation pom.xml {0} {1}".format(
                             CI_FILE_FORMAT.format(service), POM_FILE_FORMAT.format(service)
                         )
                     )

eng/mgmt/automation/swagger_to_sdk_config.json → eng/automation/swagger_to_sdk_config.json

@@ -2,25 +2,24 @@
   "$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
   "initOptions": {
     "initScript": {
-      "path": "./eng/mgmt/automation/init.sh",
+      "path": "./eng/automation/init.sh",
       "envs": [
         "JAVA_HOME_11_X64"
       ]
     }
   },
   "generateOptions": {
     "generateScript": {
-      "path": "./eng/mgmt/automation/generate.py",
+      "path": "./eng/automation/generate.py",
       "logPrefix": "Java-Sdk-Automation",
       "stderr": {
-        "showInComment": "(\\[GENERATE\\]\\[Error\\]|\\[COMPILE\\] Maven build fail|ExternalError).*",
-        "scriptError": "(\\[GENERATE\\]\\[Error\\]|\\[COMPILE\\] Maven build fail).*"
+        "showInComment": "(\\[GENERATE\\]\\[Error\\]|\\[COMPILE\\] Maven build fail|ExternalError).*"
       }
     }
   },
   "artifactOptions": {
     "installInstructionScript": {
-      "path": "./eng/mgmt/automation/install_instruction.py"
+      "path": "./eng/automation/install_instruction.py"
     }
   },
   "advancedOptions": {

eng/code-quality-reports/src/main/resources/revapi/revapi.json

@@ -492,6 +492,13 @@
           "old" : ".*? com\\.azure\\.communication\\.callautomation\\.models.*",
           "new" : ".*? com\\.azure\\.communication\\.callautomation\\.models.*",
           "justification": "Migration to azure-json"
+        },
+        {
+          "regex": true,
+          "code" : "java\\.annotation\\.removed",
+          "old" : ".*? com\\.azure\\.communication\\.chat\\.models.*",
+          "new" : ".*? com\\.azure\\.communication\\.chat\\.models.*",
+          "justification": "Migration to azure-json"
         }
       ]
     }

eng/codegen_to_sdk_config.json

@@ -1,12 +1,12 @@
 {
   "init": {
     "initScript": {
-      "path": "./eng/mgmt/automation/sdk_init.sh"
+      "path": "./eng/automation/sdk_init.sh"
     }
   },
   "generateAndBuild": {
     "generateAndBuildScript": {
-      "path": "./eng/mgmt/automation/sdk_generate.py",
+      "path": "./eng/automation/sdk_generate.py",
       "script": "python3"
     }
   }