From b60d4441c05fc4100b895ed8a8de746e4a4fdb3a Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Wed, 10 Jul 2024 13:41:36 +0800 Subject: [PATCH 1/9] rearrange folder --- eng/{mgmt => }/automation/api-specs.yaml | 0 eng/{mgmt => }/automation/changelog.py | 0 eng/{mgmt => automation}/changelog/pom.xml | 0 .../com/azure/resourcemanager/tools/changelog/Main.java | 0 .../tools/changelog/changelog/ChangeLog.java | 0 .../tools/changelog/changelog/DefinitionStageChangeLog.java | 0 .../resourcemanager/tools/changelog/utils/AllMethods.java | 0 .../resourcemanager/tools/changelog/utils/ClassName.java | 0 .../resourcemanager/tools/changelog/utils/MethodName.java | 0 .../resourcemanager/tools/changelog/utils/Namespaces.java | 0 eng/{mgmt => }/automation/generate.py | 0 eng/{mgmt => }/automation/generate_data.py | 0 eng/{mgmt => }/automation/generate_utils.py | 2 +- eng/{mgmt => }/automation/generation.yml | 0 eng/{mgmt => }/automation/generation_data.yml | 0 eng/{mgmt => }/automation/init.sh | 0 eng/{mgmt => }/automation/install_instruction.py | 0 eng/{mgmt => }/automation/parameters.py | 0 eng/{mgmt => }/automation/requirement.txt | 0 eng/{mgmt => }/automation/sdk_generate.py | 0 eng/{mgmt => }/automation/sdk_init.sh | 0 eng/{mgmt => }/automation/swagger_to_sdk_config.json | 6 +++--- eng/{mgmt => }/automation/typespec_utils.py | 0 eng/{mgmt => }/automation/utils.py | 0 24 files changed, 4 insertions(+), 4 deletions(-) rename eng/{mgmt => }/automation/api-specs.yaml (100%) rename eng/{mgmt => }/automation/changelog.py (100%) mode change 100755 => 100644 rename eng/{mgmt => automation}/changelog/pom.xml (100%) rename eng/{mgmt => automation}/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/Main.java (100%) rename eng/{mgmt => automation}/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/ChangeLog.java (100%) rename eng/{mgmt => automation}/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/DefinitionStageChangeLog.java (100%) rename eng/{mgmt => automation}/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/AllMethods.java (100%) rename eng/{mgmt => automation}/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/ClassName.java (100%) rename eng/{mgmt => automation}/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/MethodName.java (100%) rename eng/{mgmt => automation}/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/Namespaces.java (100%) rename eng/{mgmt => }/automation/generate.py (100%) mode change 100755 => 100644 rename eng/{mgmt => }/automation/generate_data.py (100%) mode change 100755 => 100644 rename eng/{mgmt => }/automation/generate_utils.py (99%) rename eng/{mgmt => }/automation/generation.yml (100%) rename eng/{mgmt => }/automation/generation_data.yml (100%) rename eng/{mgmt => }/automation/init.sh (100%) mode change 100755 => 100644 rename eng/{mgmt => }/automation/install_instruction.py (100%) mode change 100755 => 100644 rename eng/{mgmt => }/automation/parameters.py (100%) rename eng/{mgmt => }/automation/requirement.txt (100%) rename eng/{mgmt => }/automation/sdk_generate.py (100%) mode change 100755 => 100644 rename eng/{mgmt => }/automation/sdk_init.sh (100%) mode change 100755 => 100644 rename eng/{mgmt => }/automation/swagger_to_sdk_config.json (79%) rename eng/{mgmt => }/automation/typespec_utils.py (100%) rename eng/{mgmt => }/automation/utils.py (100%) diff --git a/eng/mgmt/automation/api-specs.yaml b/eng/automation/api-specs.yaml similarity index 100% rename from eng/mgmt/automation/api-specs.yaml rename to eng/automation/api-specs.yaml diff --git a/eng/mgmt/automation/changelog.py b/eng/automation/changelog.py old mode 100755 new mode 100644 similarity index 100% rename from eng/mgmt/automation/changelog.py rename to eng/automation/changelog.py diff --git a/eng/mgmt/changelog/pom.xml b/eng/automation/changelog/pom.xml similarity index 100% rename from eng/mgmt/changelog/pom.xml rename to eng/automation/changelog/pom.xml diff --git a/eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/Main.java b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/Main.java similarity index 100% rename from eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/Main.java rename to eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/Main.java diff --git a/eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/ChangeLog.java b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/ChangeLog.java similarity index 100% rename from eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/ChangeLog.java rename to eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/ChangeLog.java diff --git a/eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/DefinitionStageChangeLog.java b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/DefinitionStageChangeLog.java similarity index 100% rename from eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/DefinitionStageChangeLog.java rename to eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/DefinitionStageChangeLog.java diff --git a/eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/AllMethods.java b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/AllMethods.java similarity index 100% rename from eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/AllMethods.java rename to eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/AllMethods.java diff --git a/eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/ClassName.java b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/ClassName.java similarity index 100% rename from eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/ClassName.java rename to eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/ClassName.java diff --git a/eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/MethodName.java b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/MethodName.java similarity index 100% rename from eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/MethodName.java rename to eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/MethodName.java diff --git a/eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/Namespaces.java b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/Namespaces.java similarity index 100% rename from eng/mgmt/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/Namespaces.java rename to eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/Namespaces.java diff --git a/eng/mgmt/automation/generate.py b/eng/automation/generate.py old mode 100755 new mode 100644 similarity index 100% rename from eng/mgmt/automation/generate.py rename to eng/automation/generate.py diff --git a/eng/mgmt/automation/generate_data.py b/eng/automation/generate_data.py old mode 100755 new mode 100644 similarity index 100% rename from eng/mgmt/automation/generate_data.py rename to eng/automation/generate_data.py diff --git a/eng/mgmt/automation/generate_utils.py b/eng/automation/generate_utils.py similarity index 99% rename from eng/mgmt/automation/generate_utils.py rename to eng/automation/generate_utils.py index 9f953bbadf0b..5d6721286ee7 100644 --- a/eng/mgmt/automation/generate_utils.py +++ b/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, diff --git a/eng/mgmt/automation/generation.yml b/eng/automation/generation.yml similarity index 100% rename from eng/mgmt/automation/generation.yml rename to eng/automation/generation.yml diff --git a/eng/mgmt/automation/generation_data.yml b/eng/automation/generation_data.yml similarity index 100% rename from eng/mgmt/automation/generation_data.yml rename to eng/automation/generation_data.yml diff --git a/eng/mgmt/automation/init.sh b/eng/automation/init.sh old mode 100755 new mode 100644 similarity index 100% rename from eng/mgmt/automation/init.sh rename to eng/automation/init.sh diff --git a/eng/mgmt/automation/install_instruction.py b/eng/automation/install_instruction.py old mode 100755 new mode 100644 similarity index 100% rename from eng/mgmt/automation/install_instruction.py rename to eng/automation/install_instruction.py diff --git a/eng/mgmt/automation/parameters.py b/eng/automation/parameters.py similarity index 100% rename from eng/mgmt/automation/parameters.py rename to eng/automation/parameters.py diff --git a/eng/mgmt/automation/requirement.txt b/eng/automation/requirement.txt similarity index 100% rename from eng/mgmt/automation/requirement.txt rename to eng/automation/requirement.txt diff --git a/eng/mgmt/automation/sdk_generate.py b/eng/automation/sdk_generate.py old mode 100755 new mode 100644 similarity index 100% rename from eng/mgmt/automation/sdk_generate.py rename to eng/automation/sdk_generate.py diff --git a/eng/mgmt/automation/sdk_init.sh b/eng/automation/sdk_init.sh old mode 100755 new mode 100644 similarity index 100% rename from eng/mgmt/automation/sdk_init.sh rename to eng/automation/sdk_init.sh diff --git a/eng/mgmt/automation/swagger_to_sdk_config.json b/eng/automation/swagger_to_sdk_config.json similarity index 79% rename from eng/mgmt/automation/swagger_to_sdk_config.json rename to eng/automation/swagger_to_sdk_config.json index b5da8fc2779d..66e4ecd8867b 100644 --- a/eng/mgmt/automation/swagger_to_sdk_config.json +++ b/eng/automation/swagger_to_sdk_config.json @@ -2,7 +2,7 @@ "$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" ] @@ -10,7 +10,7 @@ }, "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).*" @@ -19,7 +19,7 @@ }, "artifactOptions": { "installInstructionScript": { - "path": "./eng/mgmt/automation/install_instruction.py" + "path": "./eng/automation/install_instruction.py" } }, "advancedOptions": { diff --git a/eng/mgmt/automation/typespec_utils.py b/eng/automation/typespec_utils.py similarity index 100% rename from eng/mgmt/automation/typespec_utils.py rename to eng/automation/typespec_utils.py diff --git a/eng/mgmt/automation/utils.py b/eng/automation/utils.py similarity index 100% rename from eng/mgmt/automation/utils.py rename to eng/automation/utils.py From 2b135d94556805d718781a2bff5c4d78d832ff0d Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Wed, 10 Jul 2024 13:42:43 +0800 Subject: [PATCH 2/9] yml files --- eng/automation/generation.yml | 4 ++-- eng/automation/generation_data.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/automation/generation.yml b/eng/automation/generation.yml index fa44feec280b..a6d67ef0d706 100644 --- a/eng/automation/generation.yml +++ b/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 "azuresdk@microsoft.com" + ./eng/automation/generate.py --tsp-config "$(TSP_CONFIG)" --version "$(VERSION)" --auto-commit-external-change --user-name "azure-sdk" --user-email "azuresdk@microsoft.com" 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 "azuresdk@microsoft.com" + ./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 "azuresdk@microsoft.com" displayName: Generation from Swagger condition: ${{ eq(parameters.RELEASE_TYPE, 'Swagger') }} diff --git a/eng/automation/generation_data.yml b/eng/automation/generation_data.yml index 7cacdc1877c9..3a28de0af705 100644 --- a/eng/automation/generation_data.yml +++ b/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 From d0250c95b5d5f991a7cf8100baf74834fb40e65d Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Wed, 10 Jul 2024 13:43:27 +0800 Subject: [PATCH 3/9] autocent.js --- sdk/resourcemanager/autocent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/resourcemanager/autocent.js b/sdk/resourcemanager/autocent.js index 0d7cd751df2d..82d2895bcb40 100644 --- a/sdk/resourcemanager/autocent.js +++ b/sdk/resourcemanager/autocent.js @@ -251,7 +251,7 @@ async function sendRequest(url) { } function getSpecsMapping() { - const api_specs_file = path.join(__dirname, "../../eng/mgmt/automation/api-specs.yaml"); + const api_specs_file = path.join(__dirname, "../../eng/automation/api-specs.yaml"); const data = fs.readFileSync(api_specs_file, "utf-8"); let specs = { managedapplications: "resources" }; Object.entries(yaml.parse(data)).forEach(([rp, service]) => { From 2aed0e1f00e7f85f92dbd9c648b95abafc469ef3 Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Wed, 10 Jul 2024 13:47:02 +0800 Subject: [PATCH 4/9] single_service_packages.md --- sdk/resourcemanager/docs/SINGLE_SERVICE_PACKAGES.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sdk/resourcemanager/docs/SINGLE_SERVICE_PACKAGES.md b/sdk/resourcemanager/docs/SINGLE_SERVICE_PACKAGES.md index 4db8201fb302..6f348720467b 100644 --- a/sdk/resourcemanager/docs/SINGLE_SERVICE_PACKAGES.md +++ b/sdk/resourcemanager/docs/SINGLE_SERVICE_PACKAGES.md @@ -67,6 +67,8 @@ service
appcomplianceautomation +* [package-2024-06](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/appcomplianceautomation/resource-manager#tag-package-2024-06) + * [1.0.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-appcomplianceautomation/1.0.0) * [package-2022-11-16-preview](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/appcomplianceautomation/resource-manager#tag-package-2022-11-16-preview) * [1.0.0-beta.1](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-appcomplianceautomation/1.0.0-beta.1)
@@ -165,6 +167,8 @@ service
avs +* [package-2023-09-01](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/vmware/resource-manager#tag-package-2023-09-01) + * [1.2.0-beta.1](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-avs/1.2.0-beta.1) * [package-2023-03-01](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/vmware/resource-manager#tag-package-2023-03-01) * [1.1.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-avs/1.1.0) * [package-2022-05-01](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/vmware/resource-manager#tag-package-2022-05-01) @@ -1477,7 +1481,10 @@ service
oracledatabase +* [package-2023-09-01](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/oracle/resource-manager#tag-package-2023-09-01) + * [1.0.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-oracledatabase/1.0.0) * [package-2023-09-01-preview](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/oracle/resource-manager#tag-package-2023-09-01-preview) + * [1.0.0-beta.2](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-oracledatabase/1.0.0-beta.2) * [1.0.0-beta.1](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-oracledatabase/1.0.0-beta.1)
@@ -1791,6 +1798,8 @@ service
scvmm +* [package-2023-10](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/scvmm/resource-manager#tag-package-2023-10) + * [1.0.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-scvmm/1.0.0) * [package-2020-06-05-preview](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/scvmm/resource-manager#tag-package-2020-06-05-preview) * [1.0.0-beta.1](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-scvmm/1.0.0-beta.1)
@@ -1991,6 +2000,8 @@ service
storagemover +* [package-2024-07](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/storagemover/resource-manager#tag-package-2024-07) + * [1.2.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-storagemover/1.2.0) * [package-2023-10](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/storagemover/resource-manager#tag-package-2023-10) * [1.1.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-storagemover/1.1.0) * [package-preview-2023-07](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/storagemover/resource-manager#tag-package-preview-2023-07) From 62f9feda6c082a90c7204fc329dc5df899235dbc Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Wed, 10 Jul 2024 13:47:35 +0800 Subject: [PATCH 5/9] codegen_to_sdk_config --- eng/codegen_to_sdk_config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/codegen_to_sdk_config.json b/eng/codegen_to_sdk_config.json index c8ccb9c172ef..a8f592eb755d 100644 --- a/eng/codegen_to_sdk_config.json +++ b/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" } } From 962a9622a47b93030ec13c156f0f6c45660a324c Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Wed, 10 Jul 2024 14:03:08 +0800 Subject: [PATCH 6/9] generate.py --- eng/automation/parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/automation/parameters.py b/eng/automation/parameters.py index 8720c4b0496f..d49d841e9ad3 100644 --- a/eng/automation/parameters.py +++ b/eng/automation/parameters.py @@ -15,7 +15,7 @@ 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/java@4.1.32" DEFAULT_VERSION = "1.0.0-beta.1" From ec02e2681b38901c1d555c57486112d082fcb66d Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Wed, 10 Jul 2024 14:13:32 +0800 Subject: [PATCH 7/9] .github .github --- .github/CODEOWNERS | 2 +- eng/automation/generate.py | 2 +- eng/automation/sdk_generate.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0ea0e2008f25..c1588b382782 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -868,10 +868,10 @@ # ######## 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 diff --git a/eng/automation/generate.py b/eng/automation/generate.py index d1e7806bfa9a..054d5f230e57 100644 --- a/eng/automation/generate.py +++ b/eng/automation/generate.py @@ -402,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) ) ) diff --git a/eng/automation/sdk_generate.py b/eng/automation/sdk_generate.py index ad728ef132ed..c1d636c16aaf 100644 --- a/eng/automation/sdk_generate.py +++ b/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) ) ) From 679e4b5b585b0e8ab1e2db74b4d65297935a9bfa Mon Sep 17 00:00:00 2001 From: xiaofeicao Date: Wed, 10 Jul 2024 14:45:13 +0800 Subject: [PATCH 8/9] fix file permissions for linux --- eng/automation/changelog.py | 0 eng/automation/generate.py | 0 eng/automation/generate_data.py | 0 eng/automation/generate_utils.py | 0 eng/automation/init.sh | 0 eng/automation/install_instruction.py | 0 eng/automation/parameters.py | 0 eng/automation/sdk_generate.py | 0 eng/automation/sdk_init.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 eng/automation/changelog.py mode change 100644 => 100755 eng/automation/generate.py mode change 100644 => 100755 eng/automation/generate_data.py mode change 100644 => 100755 eng/automation/generate_utils.py mode change 100644 => 100755 eng/automation/init.sh mode change 100644 => 100755 eng/automation/install_instruction.py mode change 100644 => 100755 eng/automation/parameters.py mode change 100644 => 100755 eng/automation/sdk_generate.py mode change 100644 => 100755 eng/automation/sdk_init.sh diff --git a/eng/automation/changelog.py b/eng/automation/changelog.py old mode 100644 new mode 100755 diff --git a/eng/automation/generate.py b/eng/automation/generate.py old mode 100644 new mode 100755 diff --git a/eng/automation/generate_data.py b/eng/automation/generate_data.py old mode 100644 new mode 100755 diff --git a/eng/automation/generate_utils.py b/eng/automation/generate_utils.py old mode 100644 new mode 100755 diff --git a/eng/automation/init.sh b/eng/automation/init.sh old mode 100644 new mode 100755 diff --git a/eng/automation/install_instruction.py b/eng/automation/install_instruction.py old mode 100644 new mode 100755 diff --git a/eng/automation/parameters.py b/eng/automation/parameters.py old mode 100644 new mode 100755 diff --git a/eng/automation/sdk_generate.py b/eng/automation/sdk_generate.py old mode 100644 new mode 100755 diff --git a/eng/automation/sdk_init.sh b/eng/automation/sdk_init.sh old mode 100644 new mode 100755 From 823254248e870d25ea76d44a3e50bcce17ea4c91 Mon Sep 17 00:00:00 2001 From: xiaofeicao Date: Thu, 11 Jul 2024 10:40:42 +0800 Subject: [PATCH 9/9] update autorest.java --- eng/automation/parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/automation/parameters.py b/eng/automation/parameters.py index d49d841e9ad3..37138ab52fec 100755 --- a/eng/automation/parameters.py +++ b/eng/automation/parameters.py @@ -17,7 +17,7 @@ SDK_ROOT = "../../" # related to file dir AUTOREST_CORE_VERSION = "3.9.7" -AUTOREST_JAVA = "@autorest/java@4.1.32" +AUTOREST_JAVA = "@autorest/java@4.1.34" DEFAULT_VERSION = "1.0.0-beta.1" GROUP_ID = "com.azure.resourcemanager" API_SPECS_FILE = "api-specs.yaml"