importer-rest-api-specs - fix-up canonisation for new cases

.github/workflows/automation-data-api-differ.yaml

@@ -23,6 +23,18 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
 
       - name: Detect Changes
         run: |

.github/workflows/automation-msgraph-metadata-importer.yaml

@@ -29,6 +29,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version: '1.21.3'
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: build and run importer-msgraph-metadata
         id: import-data

.github/workflows/automation-regenerate-go-sdk.yaml

@@ -26,6 +26,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: ensure goimports is installed
         run: |

.github/workflows/automation-regenerate-terraform.yaml

@@ -23,6 +23,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version: '1.22.7'
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: "Launch SSH Agent"
         run: |

.github/workflows/automation-rest-api-specs-importer.yaml

@@ -33,6 +33,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: build and run importer-rest-api-specs
         id: import-data
@@ -41,6 +54,7 @@ jobs:
           make tools
           make build
           make import
+          make import-data-plane
 
       - name: then commit the diff
         id: commit-imported-data

.github/workflows/automation-version-bumper.yaml

@@ -24,6 +24,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: build and run version-bumper
         id: bump-versions

.github/workflows/unit-test-data-api-differ.yaml

@@ -18,6 +18,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: run unit tests
         run: |

.github/workflows/unit-test-data-api-v2.yaml

@@ -19,6 +19,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: run unit tests
         run: |

.github/workflows/unit-test-end-to-end-data-plane.yaml

@@ -1,5 +1,5 @@
 ---
-name: Verify All Resource Manager Services can be Imported and Generated
+name: Verify All Data Plane Services can be Imported and Generated
 on:
   pull_request:
     types: ['opened', 'synchronize']
@@ -9,6 +9,10 @@ on:
       - 'tools/generator-go-sdk/**'
       - 'tools/importer-rest-api-specs/**'
 
+concurrency:
+  group: 'unit-test-dp-${{ github.head_ref }}'
+  cancel-in-progress: true # Long running, always triggers, cancel if further changes are pushed
+
 jobs:
   test:
     runs-on: custom-linux-xl
@@ -24,6 +28,18 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
 
       - name: Install tools
         run: |
@@ -36,7 +52,7 @@ jobs:
           make tools
           make build
           make import-data-plane
-# Uncomment after the first data-plane files are present in go-azure-sdk
-#      - name: "Run the Go SDK Generator"
-#        run: |
-#          ./scripts/automation-generate-go-sdk.sh data-plane
+
+      - name: "Run the Go SDK Generator"
+        run: |
+          ./scripts/automation-generate-go-sdk.sh data-plane

.github/workflows/unit-test-end-to-end-microsoft-graph.yaml

@@ -9,17 +9,38 @@ on:
       - 'tools/generator-go-sdk/**'
       - 'tools/importer-msgraph-metadata/**'
 
+concurrency:
+  group: 'unit-test-graph-${{ github.head_ref }}'
+  cancel-in-progress: true # Long running, always triggers, cancel if further changes are pushed
+
 jobs:
   test:
     runs-on: custom-linux-xl
     steps:
+      - name: mount a ramdisk to working dir
+        run: |
+          sudo mount -t tmpfs -o size=32G tmpfs $GITHUB_WORKSPACE
+
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
         with:
           submodules: recursive
 
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: "Build and Run importer-msgraph-metadata"
         id: import-data

.github/workflows/unit-test-end-to-end-resource-manager.yaml

@@ -10,6 +10,10 @@ on:
       - 'tools/generator-go-sdk/**'
       - 'tools/importer-rest-api-specs/**'
 
+concurrency:
+  group: 'unit-test-rm-${{ github.head_ref }}'
+  cancel-in-progress: true # Long running, always triggers, cancel if further changes are pushed
+
 jobs:
   test:
     runs-on: custom-linux-xl
@@ -25,6 +29,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: "Build and Run importer-rest-api-specs"
         id: import-data

.github/workflows/unit-test-generator-go-sdk.yaml

@@ -20,6 +20,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: run unit tests
         run: |

.github/workflows/unit-test-generator-terraform.yaml

@@ -20,6 +20,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: run unit tests
         run: |

.github/workflows/unit-test-rest-api-specs-importer.yaml

@@ -25,6 +25,19 @@ jobs:
       - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
         with:
           go-version-file: ./.go-version
+          cache-dependency-path: |
+            tools/generator-go-sdk/go.mod
+            tools/data-api-differ/go.mod
+            tools/wrapper-automation/go.mod
+            tools/data-api/go.mod
+            tools/importer-msgraph-metadata/go.mod
+            tools/data-api-sdk/go.mod
+            tools/sdk/go.mod
+            tools/importer-rest-api-specs/go.mod
+            tools/data-api-repository/go.mod
+            tools/version-bumper/go.mod
+            tools/generator-terraform/go.mod
+
 
       - name: run unit tests
         run: |

api-definitions/data-plane/Attestation/2022-08-01/OpenIDMetadataDiscovery/Model-JsonWebKey.json

@@ -1,5 +1,5 @@
 {
-  "name": "JsonWebKey",
+  "name": "JSONWebKey",
   "fields": [
     {
       "containsDiscriminatedTypeValue": false,

api-definitions/data-plane/Attestation/2022-08-01/OpenIDMetadataDiscovery/Model-JsonWebKeySet.json

@@ -13,7 +13,7 @@
         "nestedItem": {
           "type": "Reference",
           "nullable": false,
-          "referenceName": "JsonWebKey",
+          "referenceName": "JSONWebKey",
           "referenceNameIsCommonType": null
         }
       },

api-definitions/data-plane/KeyVault/2025-07-01/Keys/Model-DeletedKeyBundle.json

@@ -38,7 +38,7 @@
       "objectDefinition": {
         "type": "Reference",
         "nullable": false,
-        "referenceName": "JsonWebKey",
+        "referenceName": "JSONWebKey",
         "referenceNameIsCommonType": null
       },
       "optional": true,

api-definitions/data-plane/KeyVault/2025-07-01/Keys/Model-JsonWebKey.json

@@ -1,5 +1,5 @@
 {
-  "name": "JsonWebKey",
+  "name": "JSONWebKey",
   "fields": [
     {
       "containsDiscriminatedTypeValue": false,

api-definitions/data-plane/KeyVault/2025-07-01/Keys/Model-KeyBundle.json

@@ -23,7 +23,7 @@
       "objectDefinition": {
         "type": "Reference",
         "nullable": false,
-        "referenceName": "JsonWebKey",
+        "referenceName": "JSONWebKey",
         "referenceNameIsCommonType": null
       },
       "optional": true,

api-definitions/data-plane/KeyVault/2025-07-01/Keys/Model-KeyImportParameters.json

@@ -38,7 +38,7 @@
       "objectDefinition": {
         "type": "Reference",
         "nullable": false,
-        "referenceName": "JsonWebKey",
+        "referenceName": "JSONWebKey",
         "referenceNameIsCommonType": null
       },
       "optional": false,