automation, rearrange folder #41087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

XiaofeiCao merged 9 commits into main from automation_rearrange_folder

Jul 11, 2024

.github/CODEOWNERS

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

0 eng/mgmt/automation/api-specs.yaml → eng/automation/api-specs.yaml

File renamed without changes.

0 eng/mgmt/automation/changelog.py → eng/automation/changelog.py

File renamed without changes.

0 eng/mgmt/changelog/pom.xml → eng/automation/changelog/pom.xml

File renamed without changes.

0 ...resourcemanager/tools/changelog/Main.java → ...resourcemanager/tools/changelog/Main.java

File renamed without changes.

0 .../tools/changelog/changelog/ChangeLog.java → .../tools/changelog/changelog/ChangeLog.java

File renamed without changes.

0 ...g/changelog/DefinitionStageChangeLog.java → ...g/changelog/DefinitionStageChangeLog.java

File renamed without changes.

0 ...ger/tools/changelog/utils/AllMethods.java → ...ger/tools/changelog/utils/AllMethods.java

File renamed without changes.

0 ...ager/tools/changelog/utils/ClassName.java → ...ager/tools/changelog/utils/ClassName.java

File renamed without changes.

0 ...ger/tools/changelog/utils/MethodName.java → ...ger/tools/changelog/utils/MethodName.java

File renamed without changes.

0 ...ger/tools/changelog/utils/Namespaces.java → ...ger/tools/changelog/utils/Namespaces.java

File renamed without changes.

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -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)
                             )
                         )
@@ Expand Down @@

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

File renamed without changes.

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

100644 → 100755

-Original file line number
+Diff line change
@@ Expand Up / @@ -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,
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -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') }}
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

0 eng/mgmt/automation/init.sh → eng/automation/init.sh

File renamed without changes.

0 eng/mgmt/automation/install_instruction.py → eng/automation/install_instruction.py

File renamed without changes.

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

100644 → 100755

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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"

0 eng/mgmt/automation/requirement.txt → eng/automation/requirement.txt

File renamed without changes.

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -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)
                             )
                         )
@@ Expand Down @@

0 eng/mgmt/automation/sdk_init.sh → eng/automation/sdk_init.sh

File renamed without changes.

...gmt/automation/swagger_to_sdk_config.json → eng/automation/swagger_to_sdk_config.json

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,15 +2,15 @@
  
      "$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).*"

    @@ -19,7 +19,7 @@
  
      },

      "artifactOptions": {

        "installInstructionScript": {

          "path": "./eng/mgmt/automation/install_instruction.py"

          "path": "./eng/automation/install_instruction.py"

        }

      },

      "advancedOptions": {

0 eng/mgmt/automation/typespec_utils.py → eng/automation/typespec_utils.py

File renamed without changes.

0 eng/mgmt/automation/utils.py → eng/automation/utils.py

File renamed without changes.

eng/codegen_to_sdk_config.json

-Original file line number
+Diff line change
@@ -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"
         }
       }
@@ Expand Down @@

sdk/resourcemanager/autocent.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -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]) => {
@@ Expand Down @@

sdk/resourcemanager/docs/SINGLE_SERVICE_PACKAGES.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -67,6 +67,8 @@ service @@
     <details>
     <summary> appcomplianceautomation </summary>
+    * [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)
     </details>
@@ Expand Down Expand Up / @@ -165,6 +167,8 @@ service @@
     <details>
     <summary> avs </summary>
+    * [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)
@@ Expand Down Expand Up / @@ -1477,7 +1481,10 @@ service @@
     <details>
     <summary> oracledatabase </summary>
+    * [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)
     </details>
@@ Expand Down Expand Up / @@ -1791,6 +1798,8 @@ service @@
     <details>
     <summary> scvmm </summary>
+    * [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)
     </details>
@@ Expand Down Expand Up / @@ -1991,6 +2000,8 @@ service @@
     <details>
     <summary> storagemover </summary>
+    * [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)
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

automation, rearrange folder #41087

Uh oh!

Diff view

Diff view

There are no files selected for viewing