diff --git a/eng/testProjects.json b/eng/testProjects.json index 968ec152b16..5211fcc1b5c 100644 --- a/eng/testProjects.json +++ b/eng/testProjects.json @@ -21,7 +21,7 @@ "authentication/http/custom", "authentication/oauth2", "authentication/union", - "azure/resource-manager/models/resources", + "azure/resource-manager/resources", "azure/core/basic", "azure/core/lro/standard", "azure/core/lro/rpc", @@ -32,7 +32,7 @@ "azure/client-generator-core/access", "azure/client-generator-core/flatten-property", "azure/client-generator-core/usage", - "azure/resource-manager/models/common-types/managed-identity", + "azure/resource-manager/common-properties", "azure/special-headers/client-request-id", "encode/bytes", "encode/datetime", diff --git a/package-lock.json b/package-lock.json index bdea88f4058..8a66352ca73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "@autorest/csharp", "devDependencies": { - "@azure-tools/cadl-ranch-specs": "0.37.7", + "@azure-tools/cadl-ranch-specs": "0.38.0", "@azure-tools/typespec-azure-resource-manager": "0.47.0", "@azure-tools/typespec-client-generator-core": "0.47.1", "@azure-tools/typespec-csharp": "file:src/TypeSpec.Extension/Emitter.Csharp", @@ -22,14 +22,14 @@ "dev": true }, "node_modules/@azure-tools/cadl-ranch": { - "version": "0.14.7", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.14.7.tgz", - "integrity": "sha512-vJrHpLT797aelIYJlFchKsFffmhWyC+zeQ8xlt6NVjdU6xhHdYjFcVVBCTrccCAfOtI2StL3ethK119RAvjWOQ==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.15.0.tgz", + "integrity": "sha512-RU8AktXgCW7tuZF5yE2JCQdqY51qp5YJ8bvF82/M1tNwkN8GTxSXde3rBMyYnXJRd/DQUxaCqFMbwX1MgFBWFA==", "dev": true, "license": "MIT", "dependencies": { - "@azure-tools/cadl-ranch-api": "~0.4.7", - "@azure-tools/cadl-ranch-coverage-sdk": "~0.8.4", + "@azure-tools/cadl-ranch-api": "~0.5.0", + "@azure-tools/cadl-ranch-coverage-sdk": "~0.9.0", "@azure-tools/cadl-ranch-expect": "~0.15.5", "@azure/identity": "^4.4.1", "@types/js-yaml": "^4.0.5", @@ -38,9 +38,9 @@ "@typespec/rest": "~0.61.0", "ajv": "8.17.1", "axios": "^1.7.5", - "body-parser": "^1.20.2", + "body-parser": "^1.20.3", "deep-equal": "^2.2.0", - "express": "^4.19.2", + "express": "^4.20.0", "express-promise-router": "^4.1.1", "form-data": "^3.0.1", "glob": "^11.0.0", @@ -63,15 +63,15 @@ } }, "node_modules/@azure-tools/cadl-ranch-api": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.4.7.tgz", - "integrity": "sha512-eSl2RStE1Vbbe09jITyGyScXdDGO9hwKojBc+QVnpYARsF+m2J55D8ImJBZ8HNB7iURxgi1psx+oQy5PsHkFKw==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.5.0.tgz", + "integrity": "sha512-awgLMCWGy4VxIJ5n9SJuTH0WfZFsUv5kYffIYfvGPtV3NIkCwO1u39Polb4BBR8GLELWjRuHMxYsmhwpTzRBpw==", "dev": true, "license": "MIT", "dependencies": { - "body-parser": "^1.20.2", + "body-parser": "^1.20.3", "deep-equal": "^2.2.0", - "express": "^4.19.2", + "express": "^4.20.0", "express-promise-router": "^4.1.1", "glob": "^11.0.0", "morgan": "^1.10.0", @@ -167,9 +167,9 @@ } }, "node_modules/@azure-tools/cadl-ranch-coverage-sdk": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.8.4.tgz", - "integrity": "sha512-N207EZEdJrXDKUVmi5Cnw/4y+/Ou9dTbdhMPDoLaalUxZp8T/YK+Y057/M88G0dY76PEAwWPPDolLchW62LZNQ==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.9.0.tgz", + "integrity": "sha512-u4WU5U6Ps6oct9E3FiBdORMsSiqpV1VBFeiqH4ZTXCV3A245n3GzznRexZ5bDuRlRY4ea2BVvKrVnemaYaLp+w==", "dev": true, "license": "MIT", "dependencies": { @@ -198,14 +198,14 @@ } }, "node_modules/@azure-tools/cadl-ranch-specs": { - "version": "0.37.7", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.37.7.tgz", - "integrity": "sha512-Zqe5AAadPb4qa34vUlJBw5oPELlcvCwC3sMeqap6gsw1dvuFD80YrskgS0bnHtTjEERtTsFSLtjuvu74KK2b+Q==", + "version": "0.38.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.38.0.tgz", + "integrity": "sha512-AbOpERFpxYGmfFcSxDQl7ZeBy6FHEWFgqqw8FBRaugtVbeAj9BfUOPfc/OSEGNQmEIrzZJpH1N974JqhmKtKYg==", "dev": true, "license": "MIT", "dependencies": { - "@azure-tools/cadl-ranch": "~0.14.7", - "@azure-tools/cadl-ranch-api": "~0.4.7" + "@azure-tools/cadl-ranch": "~0.15.0", + "@azure-tools/cadl-ranch-api": "~0.5.0" }, "engines": { "node": ">=16.0.0" @@ -416,13 +416,14 @@ } }, "node_modules/@azure/core-auth": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.7.2.tgz", - "integrity": "sha512-Igm/S3fDYmnMq1uKS38Ae1/m37B3zigdlZw+kocwEhh5GjyKjPrXKO2J6rzpC1wAxrNil/jX9BJRqBshyjnF3g==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.9.0.tgz", + "integrity": "sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==", "dev": true, + "license": "MIT", "dependencies": { "@azure/abort-controller": "^2.0.0", - "@azure/core-util": "^1.1.0", + "@azure/core-util": "^1.11.0", "tslib": "^2.6.2" }, "engines": { @@ -537,13 +538,14 @@ } }, "node_modules/@azure/core-rest-pipeline": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.16.2.tgz", - "integrity": "sha512-Hnhm/PG9/SQ07JJyLDv3l9Qr8V3xgAe1hFoBYzt6LaalMxfL/ZqFaZf/bz5VN3pMcleCPwl8ivlS2Fjxq/iC8Q==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.17.0.tgz", + "integrity": "sha512-62Vv8nC+uPId3j86XJ0WI+sBf0jlqTqPUFCBNrGtlaUeQUIXWV/D8GE5A1d+Qx8H7OQojn2WguC8kChD6v0shA==", "dev": true, + "license": "MIT", "dependencies": { "@azure/abort-controller": "^2.0.0", - "@azure/core-auth": "^1.4.0", + "@azure/core-auth": "^1.8.0", "@azure/core-tracing": "^1.0.1", "@azure/core-util": "^1.9.0", "@azure/logger": "^1.0.0", @@ -580,10 +582,11 @@ } }, "node_modules/@azure/core-util": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.1.tgz", - "integrity": "sha512-OLsq0etbHO1MA7j6FouXFghuHrAFGk+5C1imcpQ2e+0oZhYF07WLA+NW2Vqs70R7d+zOAWiWM3tbE1sXcDN66g==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.11.0.tgz", + "integrity": "sha512-DxOSLua+NdpWoSqULhjDyAZTXFdP/LKkqtYuxxz1SCN289zk3OG8UOpnCQAz/tygyACBtWp/BoO72ptK7msY8g==", "dev": true, + "license": "MIT", "dependencies": { "@azure/abort-controller": "^2.0.0", "tslib": "^2.6.2" @@ -618,21 +621,21 @@ } }, "node_modules/@azure/identity": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.4.1.tgz", - "integrity": "sha512-DwnG4cKFEM7S3T+9u05NstXU/HN0dk45kPOinUyNKsn5VWwpXd9sbPKEg6kgJzGbm1lMuhx9o31PVbCtM5sfBA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.5.0.tgz", + "integrity": "sha512-EknvVmtBuSIic47xkOqyNabAme0RYTw52BTMz8eBgU1ysTyMrD1uOoM+JdS0J/4Yfp98IBT3osqq3BfwSaNaGQ==", "dev": true, "license": "MIT", "dependencies": { - "@azure/abort-controller": "^1.0.0", - "@azure/core-auth": "^1.5.0", + "@azure/abort-controller": "^2.0.0", + "@azure/core-auth": "^1.9.0", "@azure/core-client": "^1.9.2", - "@azure/core-rest-pipeline": "^1.1.0", + "@azure/core-rest-pipeline": "^1.17.0", "@azure/core-tracing": "^1.0.0", - "@azure/core-util": "^1.3.0", + "@azure/core-util": "^1.11.0", "@azure/logger": "^1.0.0", - "@azure/msal-browser": "^3.14.0", - "@azure/msal-node": "^2.9.2", + "@azure/msal-browser": "^3.26.1", + "@azure/msal-node": "^2.15.0", "events": "^3.0.0", "jws": "^4.0.0", "open": "^8.0.0", @@ -643,6 +646,19 @@ "node": ">=18.0.0" } }, + "node_modules/@azure/identity/node_modules/@azure/abort-controller": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz", + "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, "node_modules/@azure/logger": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.1.3.tgz", @@ -2662,10 +2678,11 @@ "dev": true }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dev": true, + "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -2675,7 +2692,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -3069,10 +3086,11 @@ "dev": true }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3324,10 +3342,11 @@ "dev": true }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -3430,7 +3449,8 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/escape-string-regexp": { "version": "1.0.5", @@ -3748,6 +3768,7 @@ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3797,37 +3818,38 @@ } }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -4000,13 +4022,14 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -4144,6 +4167,7 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -5348,10 +5372,14 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", - "dev": true + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge-stream": { "version": "2.0.0", @@ -5395,6 +5423,7 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -5860,6 +5889,7 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -5909,10 +5939,11 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", - "dev": true + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "dev": true, + "license": "MIT" }, "node_modules/path-type": { "version": "5.0.0", @@ -6117,12 +6148,13 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -6156,6 +6188,7 @@ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -6400,10 +6433,11 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, + "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -6423,22 +6457,34 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, + "license": "MIT", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -7809,13 +7855,13 @@ "dev": true }, "@azure-tools/cadl-ranch": { - "version": "0.14.7", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.14.7.tgz", - "integrity": "sha512-vJrHpLT797aelIYJlFchKsFffmhWyC+zeQ8xlt6NVjdU6xhHdYjFcVVBCTrccCAfOtI2StL3ethK119RAvjWOQ==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.15.0.tgz", + "integrity": "sha512-RU8AktXgCW7tuZF5yE2JCQdqY51qp5YJ8bvF82/M1tNwkN8GTxSXde3rBMyYnXJRd/DQUxaCqFMbwX1MgFBWFA==", "dev": true, "requires": { - "@azure-tools/cadl-ranch-api": "~0.4.7", - "@azure-tools/cadl-ranch-coverage-sdk": "~0.8.4", + "@azure-tools/cadl-ranch-api": "~0.5.0", + "@azure-tools/cadl-ranch-coverage-sdk": "~0.9.0", "@azure-tools/cadl-ranch-expect": "~0.15.5", "@azure/identity": "^4.4.1", "@types/js-yaml": "^4.0.5", @@ -7824,9 +7870,9 @@ "@typespec/rest": "~0.61.0", "ajv": "8.17.1", "axios": "^1.7.5", - "body-parser": "^1.20.2", + "body-parser": "^1.20.3", "deep-equal": "^2.2.0", - "express": "^4.19.2", + "express": "^4.20.0", "express-promise-router": "^4.1.1", "form-data": "^3.0.1", "glob": "^11.0.0", @@ -7893,14 +7939,14 @@ } }, "@azure-tools/cadl-ranch-api": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.4.7.tgz", - "integrity": "sha512-eSl2RStE1Vbbe09jITyGyScXdDGO9hwKojBc+QVnpYARsF+m2J55D8ImJBZ8HNB7iURxgi1psx+oQy5PsHkFKw==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.5.0.tgz", + "integrity": "sha512-awgLMCWGy4VxIJ5n9SJuTH0WfZFsUv5kYffIYfvGPtV3NIkCwO1u39Polb4BBR8GLELWjRuHMxYsmhwpTzRBpw==", "dev": true, "requires": { - "body-parser": "^1.20.2", + "body-parser": "^1.20.3", "deep-equal": "^2.2.0", - "express": "^4.19.2", + "express": "^4.20.0", "express-promise-router": "^4.1.1", "glob": "^11.0.0", "morgan": "^1.10.0", @@ -7963,9 +8009,9 @@ } }, "@azure-tools/cadl-ranch-coverage-sdk": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.8.4.tgz", - "integrity": "sha512-N207EZEdJrXDKUVmi5Cnw/4y+/Ou9dTbdhMPDoLaalUxZp8T/YK+Y057/M88G0dY76PEAwWPPDolLchW62LZNQ==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.9.0.tgz", + "integrity": "sha512-u4WU5U6Ps6oct9E3FiBdORMsSiqpV1VBFeiqH4ZTXCV3A245n3GzznRexZ5bDuRlRY4ea2BVvKrVnemaYaLp+w==", "dev": true, "requires": { "@azure/identity": "^4.4.1", @@ -7981,13 +8027,13 @@ "requires": {} }, "@azure-tools/cadl-ranch-specs": { - "version": "0.37.7", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.37.7.tgz", - "integrity": "sha512-Zqe5AAadPb4qa34vUlJBw5oPELlcvCwC3sMeqap6gsw1dvuFD80YrskgS0bnHtTjEERtTsFSLtjuvu74KK2b+Q==", + "version": "0.38.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.38.0.tgz", + "integrity": "sha512-AbOpERFpxYGmfFcSxDQl7ZeBy6FHEWFgqqw8FBRaugtVbeAj9BfUOPfc/OSEGNQmEIrzZJpH1N974JqhmKtKYg==", "dev": true, "requires": { - "@azure-tools/cadl-ranch": "~0.14.7", - "@azure-tools/cadl-ranch-api": "~0.4.7" + "@azure-tools/cadl-ranch": "~0.15.0", + "@azure-tools/cadl-ranch-api": "~0.5.0" } }, "@azure-tools/typespec-autorest": { @@ -8090,13 +8136,13 @@ } }, "@azure/core-auth": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.7.2.tgz", - "integrity": "sha512-Igm/S3fDYmnMq1uKS38Ae1/m37B3zigdlZw+kocwEhh5GjyKjPrXKO2J6rzpC1wAxrNil/jX9BJRqBshyjnF3g==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.9.0.tgz", + "integrity": "sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==", "dev": true, "requires": { "@azure/abort-controller": "^2.0.0", - "@azure/core-util": "^1.1.0", + "@azure/core-util": "^1.11.0", "tslib": "^2.6.2" }, "dependencies": { @@ -8192,13 +8238,13 @@ } }, "@azure/core-rest-pipeline": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.16.2.tgz", - "integrity": "sha512-Hnhm/PG9/SQ07JJyLDv3l9Qr8V3xgAe1hFoBYzt6LaalMxfL/ZqFaZf/bz5VN3pMcleCPwl8ivlS2Fjxq/iC8Q==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.17.0.tgz", + "integrity": "sha512-62Vv8nC+uPId3j86XJ0WI+sBf0jlqTqPUFCBNrGtlaUeQUIXWV/D8GE5A1d+Qx8H7OQojn2WguC8kChD6v0shA==", "dev": true, "requires": { "@azure/abort-controller": "^2.0.0", - "@azure/core-auth": "^1.4.0", + "@azure/core-auth": "^1.8.0", "@azure/core-tracing": "^1.0.1", "@azure/core-util": "^1.9.0", "@azure/logger": "^1.0.0", @@ -8228,9 +8274,9 @@ } }, "@azure/core-util": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.1.tgz", - "integrity": "sha512-OLsq0etbHO1MA7j6FouXFghuHrAFGk+5C1imcpQ2e+0oZhYF07WLA+NW2Vqs70R7d+zOAWiWM3tbE1sXcDN66g==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.11.0.tgz", + "integrity": "sha512-DxOSLua+NdpWoSqULhjDyAZTXFdP/LKkqtYuxxz1SCN289zk3OG8UOpnCQAz/tygyACBtWp/BoO72ptK7msY8g==", "dev": true, "requires": { "@azure/abort-controller": "^2.0.0", @@ -8259,25 +8305,36 @@ } }, "@azure/identity": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.4.1.tgz", - "integrity": "sha512-DwnG4cKFEM7S3T+9u05NstXU/HN0dk45kPOinUyNKsn5VWwpXd9sbPKEg6kgJzGbm1lMuhx9o31PVbCtM5sfBA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.5.0.tgz", + "integrity": "sha512-EknvVmtBuSIic47xkOqyNabAme0RYTw52BTMz8eBgU1ysTyMrD1uOoM+JdS0J/4Yfp98IBT3osqq3BfwSaNaGQ==", "dev": true, "requires": { - "@azure/abort-controller": "^1.0.0", - "@azure/core-auth": "^1.5.0", + "@azure/abort-controller": "^2.0.0", + "@azure/core-auth": "^1.9.0", "@azure/core-client": "^1.9.2", - "@azure/core-rest-pipeline": "^1.1.0", + "@azure/core-rest-pipeline": "^1.17.0", "@azure/core-tracing": "^1.0.0", - "@azure/core-util": "^1.3.0", + "@azure/core-util": "^1.11.0", "@azure/logger": "^1.0.0", - "@azure/msal-browser": "^3.14.0", - "@azure/msal-node": "^2.9.2", + "@azure/msal-browser": "^3.26.1", + "@azure/msal-node": "^2.15.0", "events": "^3.0.0", "jws": "^4.0.0", "open": "^8.0.0", "stoppable": "^1.1.0", "tslib": "^2.2.0" + }, + "dependencies": { + "@azure/abort-controller": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz", + "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==", + "dev": true, + "requires": { + "tslib": "^2.6.2" + } + } } }, "@azure/logger": { @@ -9557,9 +9614,9 @@ } }, "body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dev": true, "requires": { "bytes": "3.1.2", @@ -9570,7 +9627,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -9897,9 +9954,9 @@ "dev": true }, "cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true }, "cookie-signature": { @@ -10093,9 +10150,9 @@ "dev": true }, "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true }, "entities": { @@ -10440,37 +10497,37 @@ } }, "express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dev": true, "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -10590,13 +10647,13 @@ } }, "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -11566,9 +11623,9 @@ "dev": true }, "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", "dev": true }, "merge-stream": { @@ -11946,9 +12003,9 @@ } }, "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", "dev": true }, "path-type": { @@ -12085,12 +12142,12 @@ "dev": true }, "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, "requires": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" } }, "queue-microtask": { @@ -12261,9 +12318,9 @@ "dev": true }, "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, "requires": { "debug": "2.6.9", @@ -12281,6 +12338,12 @@ "statuses": "2.0.1" }, "dependencies": { + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -12290,15 +12353,15 @@ } }, "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, "requires": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" } }, "set-function-length": { diff --git a/package.json b/package.json index 2e25893aa55..9e3c91ead70 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "url": "https://github.com/Azure/autorest.csharp/issues" }, "devDependencies": { - "@azure-tools/cadl-ranch-specs": "0.37.7", + "@azure-tools/cadl-ranch-specs": "0.38.0", "@azure-tools/typespec-client-generator-core": "0.47.1", "@azure-tools/typespec-azure-resource-manager": "0.47.0", "@azure-tools/typespec-csharp": "file:src/TypeSpec.Extension/Emitter.Csharp", diff --git a/src/AutoRest.CSharp/Properties/launchSettings.json b/src/AutoRest.CSharp/Properties/launchSettings.json index d036f81c9cc..3d483bbe1fc 100644 --- a/src/AutoRest.CSharp/Properties/launchSettings.json +++ b/src/AutoRest.CSharp/Properties/launchSettings.json @@ -652,13 +652,13 @@ "commandName": "Project", "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\azure\\core\\traits\\src\\Generated -n" }, - "typespec-azure/resource-manager/models/common-types/managed-identity": { + "typespec-azure/resource-manager/common-properties": { "commandName": "Project", - "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\azure\\resource-manager\\models\\common-types\\managed-identity\\src\\Generated -n" + "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\azure\\resource-manager\\common-properties\\src\\Generated -n" }, - "typespec-azure/resource-manager/models/resources": { + "typespec-azure/resource-manager/resources": { "commandName": "Project", - "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\azure\\resource-manager\\models\\resources\\src\\Generated -n" + "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\azure\\resource-manager\\resources\\src\\Generated -n" }, "typespec-azure/special-headers/client-request-id": { "commandName": "Project", diff --git a/test/CadlRanchProjects.Tests/azure-resource-manager-managed-identity.cs b/test/CadlRanchProjects.Tests/azure-resource-manager-managed-identity.cs index 88e81bcd8fe..a848934c8c9 100644 --- a/test/CadlRanchProjects.Tests/azure-resource-manager-managed-identity.cs +++ b/test/CadlRanchProjects.Tests/azure-resource-manager-managed-identity.cs @@ -3,7 +3,7 @@ using AutoRest.TestServer.Tests.Infrastructure; using Azure.Core; using Azure.ResourceManager; -using _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity; +using _Azure.ResourceManager.CommonProperties; using Azure.ResourceManager.Resources; using NUnit.Framework; using Azure.ResourceManager.Models; @@ -13,7 +13,7 @@ namespace CadlRanchProjects.Tests public class AzureManagedIdentityTest : CadlRanchTestBase { [Test] - public Task Azure_Managed_Identity_ManagedIdentityTrackedResource_get() => Test(async (host) => + public Task Azure_CommonProperties_ManagedIdentity_get() => Test(async (host) => { ArmClient client = MgmtTestHelper.CreateArmClientWithMockAuth(host); var resourceId = ManagedIdentityTrackedResource.CreateResourceIdentifier("00000000-0000-0000-0000-000000000000", "test-rg", "identity"); @@ -29,7 +29,7 @@ public Task Azure_Managed_Identity_ManagedIdentityTrackedResource_get() => Test( }); [Test] - public Task Azure_Managed_Identity_ManagedIdentityTrackedResourceCollection_createWithSystemAssigned() => Test(async (host) => + public Task Azure_CommonProperties_ManagedIdentityCollection_createWithSystemAssigned() => Test(async (host) => { ArmClient client = MgmtTestHelper.CreateArmClientWithMockAuth(host); var resourceId = ResourceGroupResource.CreateResourceIdentifier("00000000-0000-0000-0000-000000000000", "test-rg"); @@ -41,7 +41,7 @@ public Task Azure_Managed_Identity_ManagedIdentityTrackedResourceCollection_crea var response = await collection.CreateOrUpdateAsync(Azure.WaitUntil.Completed, "identity", inputData); Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(AzureLocation.EastUS, response.Value.Data.Location); - Assert.AreEqual(new ResourceIdentifier("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/identity"), response.Value.Data.Id); + Assert.AreEqual(new ResourceIdentifier("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/identity"), response.Value.Data.Id); Assert.AreEqual("Succeeded", response.Value.Data.Properties.ProvisioningState); Assert.AreEqual(ManagedServiceIdentityType.SystemAssigned, response.Value.Data.Identity.ManagedServiceIdentityType); Assert.AreEqual(Guid.Empty, response.Value.Data.Identity.TenantId); @@ -49,7 +49,7 @@ public Task Azure_Managed_Identity_ManagedIdentityTrackedResourceCollection_crea }); [Test] - public Task Azure_Managed_Identity_ManagedIdentityTrackedResource_updateWithUserAssignedAndSystemAssigned() => Test(async (host) => + public Task Azure_CommonProperties_ManagedIdentity_updateWithUserAssignedAndSystemAssigned() => Test(async (host) => { ArmClient client = MgmtTestHelper.CreateArmClientWithMockAuth(host); var resourceId = ManagedIdentityTrackedResource.CreateResourceIdentifier("00000000-0000-0000-0000-000000000000", "test-rg", "identity"); diff --git a/test/CadlRanchProjects.Tests/resource-manager-models-resources.cs b/test/CadlRanchProjects.Tests/resource-manager-resources.cs similarity index 80% rename from test/CadlRanchProjects.Tests/resource-manager-models-resources.cs rename to test/CadlRanchProjects.Tests/resource-manager-resources.cs index 09d92f6c774..68d37582708 100644 --- a/test/CadlRanchProjects.Tests/resource-manager-models-resources.cs +++ b/test/CadlRanchProjects.Tests/resource-manager-resources.cs @@ -3,9 +3,9 @@ using AutoRest.TestServer.Tests.Infrastructure; using Azure.Core; using NUnit.Framework; -using _Azure.ResourceManager.Models.Resources; +using _Azure.ResourceManager.Resources; using Azure.ResourceManager.Models; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; using Azure.ResourceManager.Resources; using Azure; using Microsoft.Extensions.Azure; @@ -15,14 +15,14 @@ namespace CadlRanchProjects.Tests public class ResourceManagerModelsResourcesTests: CadlRanchTestBase { [Test] - public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_get() => Test(async (host) => + public Task Azure_ResourceManager_Resources_TopLevelTrackedResources_get() => Test(async (host) => { var id = TopLevelTrackedResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg", "top"); var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetTopLevelTrackedResource(id).GetAsync(); Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); Assert.AreEqual("top", response.Value.Data.Name); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/topLevelTrackedResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/topLevelTrackedResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual(AzureLocation.EastUS, response.Value.Data.Location); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); Assert.AreEqual("valid", response.Value.Data.Properties.Description); @@ -33,7 +33,7 @@ public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_get( }); [Test] - public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_actionSync() => Test(async (host) => + public Task Azure_ResourceManager_Resources_TopLevelTrackedResources_actionSync() => Test(async (host) => { var id = TopLevelTrackedResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg", "top"); var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetTopLevelTrackedResource(id).ActionSyncAsync(new NotificationDetails("Resource action at top level.", true)); @@ -41,7 +41,7 @@ public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_acti }); [Test] - public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_createOrReplace() => Test(async (host) => + public Task Azure_ResourceManager_Resources_TopLevelTrackedResources_createOrReplace() => Test(async (host) => { ResourceIdentifier id = ResourceGroupResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg"); TopLevelTrackedResourceData data = new TopLevelTrackedResourceData(AzureLocation.EastUS) @@ -55,7 +55,7 @@ public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_crea Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); Assert.AreEqual("top", response.Value.Data.Name); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/topLevelTrackedResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/topLevelTrackedResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual(AzureLocation.EastUS, response.Value.Data.Location); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); Assert.AreEqual("valid", response.Value.Data.Properties.Description); @@ -66,7 +66,7 @@ public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_crea }); [Test] - public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_update() => Test(async (host) => + public Task Azure_ResourceManager_Resources_TopLevelTrackedResources_update() => Test(async (host) => { var id = TopLevelTrackedResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg", "top"); var data = new TopLevelTrackedResourceData(AzureLocation.EastUS) @@ -80,7 +80,7 @@ public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_upda Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); Assert.AreEqual("top", response.Value.Data.Name); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/topLevelTrackedResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/topLevelTrackedResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual(AzureLocation.EastUS, response.Value.Data.Location); Assert.AreEqual("valid2", response.Value.Data.Properties.Description); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); @@ -91,7 +91,7 @@ public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_upda }); [Test] - public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_delete() => Test(async (host) => + public Task Azure_ResourceManager_Resources_TopLevelTrackedResources_delete() => Test(async (host) => { var id = TopLevelTrackedResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg", "top"); var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetTopLevelTrackedResource(id).DeleteAsync(WaitUntil.Completed); @@ -99,14 +99,14 @@ public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_dele }); [Test] - public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_listByResourceGroup() => Test(async (host) => + public Task Azure_ResourceManager_Resources_TopLevelTrackedResources_listByResourceGroup() => Test(async (host) => { var id = ResourceGroupResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg"); var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetResourceGroupResource(id).GetTopLevelTrackedResourceAsync("top"); Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); Assert.AreEqual("top", response.Value.Data.Name); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/topLevelTrackedResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/topLevelTrackedResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual(AzureLocation.EastUS, response.Value.Data.Location); Assert.AreEqual("valid", response.Value.Data.Properties.Description); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); @@ -117,7 +117,7 @@ public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_list }); [Test] - public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_listBySubscription() => Test(async (host) => + public Task Azure_ResourceManager_Resources_TopLevelTrackedResources_listBySubscription() => Test(async (host) => { var id = SubscriptionResource.CreateResourceIdentifier(Guid.Empty.ToString()); var responses = MgmtTestHelper.CreateArmClientWithMockAuth(host).GetSubscriptionResource(id).GetTopLevelTrackedResourcesAsync(); @@ -127,7 +127,7 @@ public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_list sum++; Assert.AreEqual(true, response.HasData); Assert.AreEqual("top", response.Data.Name); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/topLevelTrackedResources", response.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/topLevelTrackedResources", response.Data.ResourceType.ToString()); Assert.AreEqual(AzureLocation.EastUS, response.Data.Location); Assert.AreEqual("valid", response.Data.Properties.Description); Assert.AreEqual(ProvisioningState.Succeeded, response.Data.Properties.ProvisioningState); @@ -140,13 +140,13 @@ public Task Azure_ResourceManager_Models_Resources_TopLevelTrackedResources_list }); [Test] - public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_get() => Test(async (host) => + public Task Azure_ResourceManager_Resources_NestedProxyResources_get() => Test(async (host) => { var id = NestedProxyResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg", "top", "nested"); var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetNestedProxyResource(id).GetAsync(); Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual("valid", response.Value.Data.Properties.Description); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); Assert.AreEqual("AzureSDK", response.Value.Data.SystemData.CreatedBy); @@ -156,7 +156,7 @@ public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_get() => }); [Test] - public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_createOrReplace() => Test(async (host) => + public Task Azure_ResourceManager_Resources_NestedProxyResources_createOrReplace() => Test(async (host) => { var id = TopLevelTrackedResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg", "top"); var data = new NestedProxyResourceData() @@ -169,7 +169,7 @@ public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_createOr var response =await (await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetTopLevelTrackedResource(id).GetAsync()).Value.GetNestedProxyResources().CreateOrUpdateAsync(WaitUntil.Completed, "nested", data); Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual("valid", response.Value.Data.Properties.Description); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); Assert.AreEqual("AzureSDK", response.Value.Data.SystemData.CreatedBy); @@ -179,7 +179,7 @@ public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_createOr }); [Test] - public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_update() => Test(async (host) => + public Task Azure_ResourceManager_Resources_NestedProxyResources_update() => Test(async (host) => { var id = NestedProxyResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg", "top", "nested"); var data = new NestedProxyResourceData() @@ -192,7 +192,7 @@ public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_update() var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetNestedProxyResource(id).UpdateAsync(WaitUntil.Completed, data); Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual("valid2", response.Value.Data.Properties.Description); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); Assert.AreEqual("AzureSDK", response.Value.Data.SystemData.CreatedBy); @@ -202,7 +202,7 @@ public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_update() }); [Test] - public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_delete() => Test(async (host) => + public Task Azure_ResourceManager_Resources_NestedProxyResources_delete() => Test(async (host) => { var id = NestedProxyResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg", "top", "nested"); var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetNestedProxyResource(id).DeleteAsync(WaitUntil.Completed); @@ -210,13 +210,13 @@ public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_delete() }); [Test] - public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_listByTopLevelTrackedResource() => Test(async (host) => + public Task Azure_ResourceManager_Resources_NestedProxyResources_listByTopLevelTrackedResource() => Test(async (host) => { var id = TopLevelTrackedResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg", "top"); var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetTopLevelTrackedResource(id).GetNestedProxyResourceAsync("nested"); Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual("valid", response.Value.Data.Properties.Description); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); Assert.AreEqual("AzureSDK", response.Value.Data.SystemData.CreatedBy); @@ -226,7 +226,7 @@ public Task Azure_ResourceManager_Models_Resources_NestedProxyResources_listByTo }); [Test] - public Task Azure_ResourceManager_Models_Resources_SingletonTrackedResource_createOrUpdate() => Test(async (host) => + public Task Azure_ResourceManager_Resources_SingletonTrackedResource_createOrUpdate() => Test(async (host) => { var id = SingletonTrackedResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg"); var data = new SingletonTrackedResourceData(AzureLocation.EastUS) @@ -239,7 +239,7 @@ public Task Azure_ResourceManager_Models_Resources_SingletonTrackedResource_crea var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetSingletonTrackedResource(id).CreateOrUpdateAsync(WaitUntil.Completed, data); Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/singletonTrackedResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/singletonTrackedResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual("valid", response.Value.Data.Properties.Description); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); Assert.AreEqual("AzureSDK", response.Value.Data.SystemData.CreatedBy); @@ -249,7 +249,7 @@ public Task Azure_ResourceManager_Models_Resources_SingletonTrackedResource_crea }); [Test] - public Task Azure_ResourceManager_Models_Resources_SingletonTrackedResource_update() => Test(async (host) => + public Task Azure_ResourceManager_Resources_SingletonTrackedResource_update() => Test(async (host) => { var id = SingletonTrackedResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg"); var data = new SingletonTrackedResourceData(AzureLocation.EastUS2) @@ -262,7 +262,7 @@ public Task Azure_ResourceManager_Models_Resources_SingletonTrackedResource_upda var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetSingletonTrackedResource(id).UpdateAsync(data); Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/singletonTrackedResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/singletonTrackedResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual("valid2", response.Value.Data.Properties.Description); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); Assert.AreEqual("AzureSDK", response.Value.Data.SystemData.CreatedBy); @@ -272,13 +272,13 @@ public Task Azure_ResourceManager_Models_Resources_SingletonTrackedResource_upda }); [Test] - public Task Azure_ResourceManager_Models_Resources_SingletonTrackedResource_getByResourceGroup() => Test(async (host) => + public Task Azure_ResourceManager_Resources_SingletonTrackedResource_getByResourceGroup() => Test(async (host) => { var id = SingletonTrackedResource.CreateResourceIdentifier(Guid.Empty.ToString(), "test-rg"); var response = await MgmtTestHelper.CreateArmClientWithMockAuth(host).GetSingletonTrackedResource(id).GetAsync(); Assert.AreEqual(200, response.GetRawResponse().Status); Assert.AreEqual(true, response.Value.HasData); - Assert.AreEqual("Azure.ResourceManager.Models.Resources/singletonTrackedResources", response.Value.Data.ResourceType.ToString()); + Assert.AreEqual("Azure.ResourceManager.Resources/singletonTrackedResources", response.Value.Data.ResourceType.ToString()); Assert.AreEqual("valid", response.Value.Data.Properties.Description); Assert.AreEqual(ProvisioningState.Succeeded, response.Value.Data.Properties.ProvisioningState); Assert.AreEqual("AzureSDK", response.Value.Data.SystemData.CreatedBy); diff --git a/test/CadlRanchProjects/azure/resource-manager/common-properties/Configuration.json b/test/CadlRanchProjects/azure/resource-manager/common-properties/Configuration.json new file mode 100644 index 00000000000..17bf555bc2d --- /dev/null +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/Configuration.json @@ -0,0 +1,12 @@ +{ + "output-folder": ".", + "namespace": "_Azure.ResourceManager.CommonProperties", + "library-name": "_Azure.ResourceManager.CommonProperties", + "flavor": "azure", + "use-model-reader-writer": true, + "shared-source-folders": [ + "../../../../../../../artifacts/bin/AutoRest.CSharp/Debug/net8.0/Generator.Shared", + "../../../../../../../artifacts/bin/AutoRest.CSharp/Debug/net8.0/Azure.Core.Shared" + ], + "azure-arm": true +} diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/_Azure.ResourceManager.Models.Resources.sln b/test/CadlRanchProjects/azure/resource-manager/common-properties/_Azure.ResourceManager.CommonProperties.sln similarity index 92% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/_Azure.ResourceManager.Models.Resources.sln rename to test/CadlRanchProjects/azure/resource-manager/common-properties/_Azure.ResourceManager.CommonProperties.sln index 2d29c18f9e9..b8e7212a164 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/_Azure.ResourceManager.Models.Resources.sln +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/_Azure.ResourceManager.CommonProperties.sln @@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Azure.ResourceManager.Models.Resources", "src\_Azure.ResourceManager.Models.Resources.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Azure.ResourceManager.CommonProperties", "src\_Azure.ResourceManager.CommonProperties.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Azure.ResourceManager.Models.Resources.Tests", "tests\_Azure.ResourceManager.Models.Resources.Tests.csproj", "{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Azure.ResourceManager.CommonProperties.Tests", "tests\_Azure.ResourceManager.CommonProperties.Tests.csproj", "{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ArmAzureResourceManagerModelsCommonTypesManagedIdentityModelFactory.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ArmAzureResourceManagerCommonPropertiesModelFactory.cs similarity index 81% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ArmAzureResourceManagerModelsCommonTypesManagedIdentityModelFactory.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ArmAzureResourceManagerCommonPropertiesModelFactory.cs index ab5f26012ea..dc7cbd1fc55 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ArmAzureResourceManagerModelsCommonTypesManagedIdentityModelFactory.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ArmAzureResourceManagerCommonPropertiesModelFactory.cs @@ -11,12 +11,12 @@ using Azure.Core; using Azure.ResourceManager.Models; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Models +namespace _Azure.ResourceManager.CommonProperties.Models { /// Model factory for models. - public static partial class ArmAzureResourceManagerModelsCommonTypesManagedIdentityModelFactory + public static partial class ArmAzureResourceManagerCommonPropertiesModelFactory { - /// Initializes a new instance of . + /// Initializes a new instance of . /// The id. /// The name. /// The resourceType. @@ -25,7 +25,7 @@ public static partial class ArmAzureResourceManagerModelsCommonTypesManagedIdent /// The location. /// The resource-specific properties for this resource. /// The managed service identities assigned to this resource. - /// A new instance for mocking. + /// A new instance for mocking. public static ManagedIdentityTrackedResourceData ManagedIdentityTrackedResourceData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary tags = null, AzureLocation location = default, string managedIdentityTrackedResourceProvisioningState = null, ManagedServiceIdentity identity = null) { tags ??= new Dictionary(); diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Extensions/Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Extensions/Mockable_AzureResourceManagerCommonPropertiesArmClient.cs similarity index 68% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Extensions/Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Extensions/Mockable_AzureResourceManagerCommonPropertiesArmClient.cs index 8a6bb75acda..62c92c17d6b 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Extensions/Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Extensions/Mockable_AzureResourceManagerCommonPropertiesArmClient.cs @@ -8,24 +8,24 @@ using Azure.Core; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Mocking +namespace _Azure.ResourceManager.CommonProperties.Mocking { /// A class to add extension methods to ArmClient. - public partial class Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient : ArmResource + public partial class Mockable_AzureResourceManagerCommonPropertiesArmClient : ArmResource { - /// Initializes a new instance of the class for mocking. - protected Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient() + /// Initializes a new instance of the class for mocking. + protected Mockable_AzureResourceManagerCommonPropertiesArmClient() { } - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// The client parameters to use in these operations. /// The identifier of the resource that is the target of operations. - internal Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient(ArmClient client, ResourceIdentifier id) : base(client, id) + internal Mockable_AzureResourceManagerCommonPropertiesArmClient(ArmClient client, ResourceIdentifier id) : base(client, id) { } - internal Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient(ArmClient client) : this(client, ResourceIdentifier.Root) + internal Mockable_AzureResourceManagerCommonPropertiesArmClient(ArmClient client) : this(client, ResourceIdentifier.Root) { } diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Extensions/Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Extensions/Mockable_AzureResourceManagerCommonPropertiesResourceGroupResource.cs similarity index 81% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Extensions/Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Extensions/Mockable_AzureResourceManagerCommonPropertiesResourceGroupResource.cs index fb797d777b4..f0df8debf8d 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Extensions/Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Extensions/Mockable_AzureResourceManagerCommonPropertiesResourceGroupResource.cs @@ -12,20 +12,20 @@ using Azure.Core; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Mocking +namespace _Azure.ResourceManager.CommonProperties.Mocking { /// A class to add extension methods to ResourceGroupResource. - public partial class Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource : ArmResource + public partial class Mockable_AzureResourceManagerCommonPropertiesResourceGroupResource : ArmResource { - /// Initializes a new instance of the class for mocking. - protected Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource() + /// Initializes a new instance of the class for mocking. + protected Mockable_AzureResourceManagerCommonPropertiesResourceGroupResource() { } - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// The client parameters to use in these operations. /// The identifier of the resource that is the target of operations. - internal Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource(ArmClient client, ResourceIdentifier id) : base(client, id) + internal Mockable_AzureResourceManagerCommonPropertiesResourceGroupResource(ArmClient client, ResourceIdentifier id) : base(client, id) { } @@ -47,7 +47,7 @@ public virtual ManagedIdentityTrackedResourceCollection GetManagedIdentityTracke /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -78,7 +78,7 @@ public virtual async Task> GetManagedId /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Extensions/_AzureResourceManagerModelsCommonTypesManagedIdentityExtensions.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Extensions/_AzureResourceManagerCommonPropertiesExtensions.cs similarity index 71% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Extensions/_AzureResourceManagerModelsCommonTypesManagedIdentityExtensions.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Extensions/_AzureResourceManagerCommonPropertiesExtensions.cs index 1aa592ba820..f6b78055c50 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Extensions/_AzureResourceManagerModelsCommonTypesManagedIdentityExtensions.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Extensions/_AzureResourceManagerCommonPropertiesExtensions.cs @@ -12,21 +12,21 @@ using Azure.Core; using Azure.ResourceManager; using Azure.ResourceManager.Resources; -using _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Mocking; +using _Azure.ResourceManager.CommonProperties.Mocking; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.CommonProperties { - /// A class to add extension methods to _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity. - public static partial class _AzureResourceManagerModelsCommonTypesManagedIdentityExtensions + /// A class to add extension methods to _Azure.ResourceManager.CommonProperties. + public static partial class _AzureResourceManagerCommonPropertiesExtensions { - private static Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient GetMockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient(ArmClient client) + private static Mockable_AzureResourceManagerCommonPropertiesArmClient GetMockable_AzureResourceManagerCommonPropertiesArmClient(ArmClient client) { - return client.GetCachedClient(client0 => new Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient(client0)); + return client.GetCachedClient(client0 => new Mockable_AzureResourceManagerCommonPropertiesArmClient(client0)); } - private static Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource GetMockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource(ArmResource resource) + private static Mockable_AzureResourceManagerCommonPropertiesResourceGroupResource GetMockable_AzureResourceManagerCommonPropertiesResourceGroupResource(ArmResource resource) { - return resource.GetCachedClient(client => new Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource(client, resource.Id)); + return resource.GetCachedClient(client => new Mockable_AzureResourceManagerCommonPropertiesResourceGroupResource(client, resource.Id)); } /// @@ -34,7 +34,7 @@ private static Mockable_AzureResourceManagerModelsCommonTypesManagedIdentityReso /// You can use to create a from its components. /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -45,14 +45,14 @@ public static ManagedIdentityTrackedResource GetManagedIdentityTrackedResource(t { Argument.AssertNotNull(client, nameof(client)); - return GetMockable_AzureResourceManagerModelsCommonTypesManagedIdentityArmClient(client).GetManagedIdentityTrackedResource(id); + return GetMockable_AzureResourceManagerCommonPropertiesArmClient(client).GetManagedIdentityTrackedResource(id); } /// /// Gets a collection of ManagedIdentityTrackedResources in the ResourceGroupResource. /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -62,7 +62,7 @@ public static ManagedIdentityTrackedResourceCollection GetManagedIdentityTracked { Argument.AssertNotNull(resourceGroupResource, nameof(resourceGroupResource)); - return GetMockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource(resourceGroupResource).GetManagedIdentityTrackedResources(); + return GetMockable_AzureResourceManagerCommonPropertiesResourceGroupResource(resourceGroupResource).GetManagedIdentityTrackedResources(); } /// @@ -70,7 +70,7 @@ public static ManagedIdentityTrackedResourceCollection GetManagedIdentityTracked /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -87,7 +87,7 @@ public static ManagedIdentityTrackedResourceCollection GetManagedIdentityTracked /// /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -100,7 +100,7 @@ public static async Task> GetManagedIde { Argument.AssertNotNull(resourceGroupResource, nameof(resourceGroupResource)); - return await GetMockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource(resourceGroupResource).GetManagedIdentityTrackedResourceAsync(managedIdentityTrackedResourceName, cancellationToken).ConfigureAwait(false); + return await GetMockable_AzureResourceManagerCommonPropertiesResourceGroupResource(resourceGroupResource).GetManagedIdentityTrackedResourceAsync(managedIdentityTrackedResourceName, cancellationToken).ConfigureAwait(false); } /// @@ -108,7 +108,7 @@ public static async Task> GetManagedIde /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -125,7 +125,7 @@ public static async Task> GetManagedIde /// /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -138,7 +138,7 @@ public static Response GetManagedIdentityTracked { Argument.AssertNotNull(resourceGroupResource, nameof(resourceGroupResource)); - return GetMockable_AzureResourceManagerModelsCommonTypesManagedIdentityResourceGroupResource(resourceGroupResource).GetManagedIdentityTrackedResource(managedIdentityTrackedResourceName, cancellationToken); + return GetMockable_AzureResourceManagerCommonPropertiesResourceGroupResource(resourceGroupResource).GetManagedIdentityTrackedResource(managedIdentityTrackedResourceName, cancellationToken); } } } diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/Argument.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/Argument.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/Argument.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/Argument.cs index 4dae2bc19d2..6ff9d1c993a 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/Argument.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/Argument.cs @@ -9,7 +9,7 @@ using System.Collections; using System.Collections.Generic; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.CommonProperties { internal static class Argument { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/ChangeTrackingDictionary.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/ChangeTrackingDictionary.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/ChangeTrackingDictionary.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/ChangeTrackingDictionary.cs index 0e722ac6fdd..5464821dddb 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/ChangeTrackingDictionary.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/ChangeTrackingDictionary.cs @@ -9,7 +9,7 @@ using System.Collections; using System.Collections.Generic; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.CommonProperties { internal class ChangeTrackingDictionary : IDictionary, IReadOnlyDictionary where TKey : notnull { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/ChangeTrackingList.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/ChangeTrackingList.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/ChangeTrackingList.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/ChangeTrackingList.cs index f89c2495c1a..8193b7e18dd 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/ChangeTrackingList.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/ChangeTrackingList.cs @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.CommonProperties { internal class ChangeTrackingList : IList, IReadOnlyList { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/ModelSerializationExtensions.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/ModelSerializationExtensions.cs similarity index 99% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/ModelSerializationExtensions.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/ModelSerializationExtensions.cs index 38087478fa4..98feda7c27b 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/ModelSerializationExtensions.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/ModelSerializationExtensions.cs @@ -14,7 +14,7 @@ using System.Xml; using Azure.Core; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.CommonProperties { internal static class ModelSerializationExtensions { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/Optional.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/Optional.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/Optional.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/Optional.cs index e16949fdeb7..4c98bd18360 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/Optional.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/Optional.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Text.Json; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.CommonProperties { internal static class Optional { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/Utf8JsonRequestContent.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/Utf8JsonRequestContent.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/Utf8JsonRequestContent.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/Utf8JsonRequestContent.cs index 24fb5ad6949..64e5f086100 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Internal/Utf8JsonRequestContent.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Internal/Utf8JsonRequestContent.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Azure.Core; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.CommonProperties { internal class Utf8JsonRequestContent : RequestContent { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/LongRunningOperation/ManagedIdentityArmOperationOfT.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/LongRunningOperation/CommonPropertiesArmOperationOfT.cs similarity index 84% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/LongRunningOperation/ManagedIdentityArmOperationOfT.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/LongRunningOperation/CommonPropertiesArmOperationOfT.cs index 61792822468..49f5fa606dd 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/LongRunningOperation/ManagedIdentityArmOperationOfT.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/LongRunningOperation/CommonPropertiesArmOperationOfT.cs @@ -15,10 +15,10 @@ using Azure.Core.Pipeline; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.CommonProperties { #pragma warning disable SA1649 // File name should match first type name - internal class ManagedIdentityArmOperation : ArmOperation + internal class CommonPropertiesArmOperation : ArmOperation #pragma warning restore SA1649 // File name should match first type name { private readonly OperationInternal _operation; @@ -26,19 +26,19 @@ internal class ManagedIdentityArmOperation : ArmOperation private readonly NextLinkOperationImplementation _nextLinkOperation; private readonly string _operationId; - /// Initializes a new instance of ManagedIdentityArmOperation for mocking. - protected ManagedIdentityArmOperation() + /// Initializes a new instance of CommonPropertiesArmOperation for mocking. + protected CommonPropertiesArmOperation() { } - internal ManagedIdentityArmOperation(Response response, RehydrationToken? rehydrationToken = null) + internal CommonPropertiesArmOperation(Response response, RehydrationToken? rehydrationToken = null) { _operation = OperationInternal.Succeeded(response.GetRawResponse(), response.Value); _completeRehydrationToken = rehydrationToken; _operationId = GetOperationId(rehydrationToken); } - internal ManagedIdentityArmOperation(IOperationSource source, ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Request request, Response response, OperationFinalStateVia finalStateVia, bool skipApiVersionOverride = false, string apiVersionOverrideValue = null) + internal CommonPropertiesArmOperation(IOperationSource source, ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Request request, Response response, OperationFinalStateVia finalStateVia, bool skipApiVersionOverride = false, string apiVersionOverrideValue = null) { var nextLinkOperation = NextLinkOperationImplementation.Create(pipeline, request.Method, request.Uri.ToUri(), response, finalStateVia, skipApiVersionOverride, apiVersionOverrideValue); if (nextLinkOperation is NextLinkOperationImplementation nextLinkOperationValue) @@ -51,7 +51,7 @@ internal ManagedIdentityArmOperation(IOperationSource source, ClientDiagnosti _completeRehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(request.Method, request.Uri.ToUri(), response, finalStateVia); _operationId = GetOperationId(_completeRehydrationToken); } - _operation = new OperationInternal(NextLinkOperationImplementation.Create(source, nextLinkOperation), clientDiagnostics, response, "ManagedIdentityArmOperation", fallbackStrategy: new SequentialDelayStrategy()); + _operation = new OperationInternal(NextLinkOperationImplementation.Create(source, nextLinkOperation), clientDiagnostics, response, "CommonPropertiesArmOperation", fallbackStrategy: new SequentialDelayStrategy()); } private string GetOperationId(RehydrationToken? rehydrationToken) diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResource.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResource.Serialization.cs similarity index 95% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResource.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResource.Serialization.cs index 258c2e3791d..86909563c64 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResource.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResource.Serialization.cs @@ -9,7 +9,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.CommonProperties { public partial class ManagedIdentityTrackedResource : IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResource.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResource.cs similarity index 83% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResource.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResource.cs index 2f10a768946..e8ccca1b0c2 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResource.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResource.cs @@ -16,7 +16,7 @@ using Azure.ResourceManager; using Azure.ResourceManager.Resources; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.CommonProperties { /// /// A Class representing a ManagedIdentityTrackedResource along with the instance operations that can be performed on it. @@ -32,16 +32,16 @@ public partial class ManagedIdentityTrackedResource : ArmResource /// The managedIdentityTrackedResourceName. public static ResourceIdentifier CreateResourceIdentifier(string subscriptionId, string resourceGroupName, string managedIdentityTrackedResourceName) { - var resourceId = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}"; + var resourceId = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}"; return new ResourceIdentifier(resourceId); } - private readonly ClientDiagnostics _managedIdentityTrackedResourceClientDiagnostics; - private readonly ManagedIdentityTrackedResourcesRestOperations _managedIdentityTrackedResourceRestClient; + private readonly ClientDiagnostics _managedIdentityTrackedResourceManagedIdentityClientDiagnostics; + private readonly ManagedIdentityRestOperations _managedIdentityTrackedResourceManagedIdentityRestClient; private readonly ManagedIdentityTrackedResourceData _data; /// Gets the resource type for the operations. - public static readonly ResourceType ResourceType = "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources"; + public static readonly ResourceType ResourceType = "Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources"; /// Initializes a new instance of the class for mocking. protected ManagedIdentityTrackedResource() @@ -62,9 +62,9 @@ internal ManagedIdentityTrackedResource(ArmClient client, ManagedIdentityTracked /// The identifier of the resource that is the target of operations. internal ManagedIdentityTrackedResource(ArmClient client, ResourceIdentifier id) : base(client, id) { - _managedIdentityTrackedResourceClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity", ResourceType.Namespace, Diagnostics); - TryGetApiVersion(ResourceType, out string managedIdentityTrackedResourceApiVersion); - _managedIdentityTrackedResourceRestClient = new ManagedIdentityTrackedResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, managedIdentityTrackedResourceApiVersion); + _managedIdentityTrackedResourceManagedIdentityClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.CommonProperties", ResourceType.Namespace, Diagnostics); + TryGetApiVersion(ResourceType, out string managedIdentityTrackedResourceManagedIdentityApiVersion); + _managedIdentityTrackedResourceManagedIdentityRestClient = new ManagedIdentityRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, managedIdentityTrackedResourceManagedIdentityApiVersion); #if DEBUG ValidateResourceId(Id); #endif @@ -96,7 +96,7 @@ internal static void ValidateResourceId(ResourceIdentifier id) /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -115,11 +115,11 @@ internal static void ValidateResourceId(ResourceIdentifier id) /// The cancellation token to use. public virtual async Task> GetAsync(CancellationToken cancellationToken = default) { - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.Get"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.Get"); scope.Start(); try { - var response = await _managedIdentityTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); + var response = await _managedIdentityTrackedResourceManagedIdentityRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new ManagedIdentityTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -136,7 +136,7 @@ public virtual async Task> GetAsync(Can /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -155,11 +155,11 @@ public virtual async Task> GetAsync(Can /// The cancellation token to use. public virtual Response Get(CancellationToken cancellationToken = default) { - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.Get"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.Get"); scope.Start(); try { - var response = _managedIdentityTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); + var response = _managedIdentityTrackedResourceManagedIdentityRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new ManagedIdentityTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -176,7 +176,7 @@ public virtual Response Get(CancellationToken ca /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -199,11 +199,11 @@ public virtual async Task> UpdateAsync( { Argument.AssertNotNull(data, nameof(data)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.Update"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.Update"); scope.Start(); try { - var response = await _managedIdentityTrackedResourceRestClient.UpdateWithUserAssignedAndSystemAssignedAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data, cancellationToken).ConfigureAwait(false); + var response = await _managedIdentityTrackedResourceManagedIdentityRestClient.UpdateWithUserAssignedAndSystemAssignedAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data, cancellationToken).ConfigureAwait(false); return Response.FromValue(new ManagedIdentityTrackedResource(Client, response.Value), response.GetRawResponse()); } catch (Exception e) @@ -218,7 +218,7 @@ public virtual async Task> UpdateAsync( /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -241,11 +241,11 @@ public virtual Response Update(ManagedIdentityTr { Argument.AssertNotNull(data, nameof(data)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.Update"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.Update"); scope.Start(); try { - var response = _managedIdentityTrackedResourceRestClient.UpdateWithUserAssignedAndSystemAssigned(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data, cancellationToken); + var response = _managedIdentityTrackedResourceManagedIdentityRestClient.UpdateWithUserAssignedAndSystemAssigned(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data, cancellationToken); return Response.FromValue(new ManagedIdentityTrackedResource(Client, response.Value), response.GetRawResponse()); } catch (Exception e) @@ -260,7 +260,7 @@ public virtual Response Update(ManagedIdentityTr /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -285,7 +285,7 @@ public virtual async Task> AddTagAsync( Argument.AssertNotNull(key, nameof(key)); Argument.AssertNotNull(value, nameof(value)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.AddTag"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.AddTag"); scope.Start(); try { @@ -294,7 +294,7 @@ public virtual async Task> AddTagAsync( var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false); originalTags.Value.Data.TagValues[key] = value; await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false); - var originalResponse = await _managedIdentityTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); + var originalResponse = await _managedIdentityTrackedResourceManagedIdentityRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); return Response.FromValue(new ManagedIdentityTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -322,7 +322,7 @@ public virtual async Task> AddTagAsync( /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -347,7 +347,7 @@ public virtual Response AddTag(string key, strin Argument.AssertNotNull(key, nameof(key)); Argument.AssertNotNull(value, nameof(value)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.AddTag"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.AddTag"); scope.Start(); try { @@ -356,7 +356,7 @@ public virtual Response AddTag(string key, strin var originalTags = GetTagResource().Get(cancellationToken); originalTags.Value.Data.TagValues[key] = value; GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken); - var originalResponse = _managedIdentityTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); + var originalResponse = _managedIdentityTrackedResourceManagedIdentityRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); return Response.FromValue(new ManagedIdentityTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -384,7 +384,7 @@ public virtual Response AddTag(string key, strin /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -407,7 +407,7 @@ public virtual async Task> SetTagsAsync { Argument.AssertNotNull(tags, nameof(tags)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.SetTags"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.SetTags"); scope.Start(); try { @@ -417,7 +417,7 @@ public virtual async Task> SetTagsAsync var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false); originalTags.Value.Data.TagValues.ReplaceWith(tags); await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false); - var originalResponse = await _managedIdentityTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); + var originalResponse = await _managedIdentityTrackedResourceManagedIdentityRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); return Response.FromValue(new ManagedIdentityTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -441,7 +441,7 @@ public virtual async Task> SetTagsAsync /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -464,7 +464,7 @@ public virtual Response SetTags(IDictionary SetTags(IDictionary SetTags(IDictionary /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -521,7 +521,7 @@ public virtual async Task> RemoveTagAsy { Argument.AssertNotNull(key, nameof(key)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.RemoveTag"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.RemoveTag"); scope.Start(); try { @@ -530,7 +530,7 @@ public virtual async Task> RemoveTagAsy var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false); originalTags.Value.Data.TagValues.Remove(key); await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false); - var originalResponse = await _managedIdentityTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); + var originalResponse = await _managedIdentityTrackedResourceManagedIdentityRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); return Response.FromValue(new ManagedIdentityTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -558,7 +558,7 @@ public virtual async Task> RemoveTagAsy /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -581,7 +581,7 @@ public virtual Response RemoveTag(string key, Ca { Argument.AssertNotNull(key, nameof(key)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.RemoveTag"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResource.RemoveTag"); scope.Start(); try { @@ -590,7 +590,7 @@ public virtual Response RemoveTag(string key, Ca var originalTags = GetTagResource().Get(cancellationToken); originalTags.Value.Data.TagValues.Remove(key); GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken); - var originalResponse = _managedIdentityTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); + var originalResponse = _managedIdentityTrackedResourceManagedIdentityRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); return Response.FromValue(new ManagedIdentityTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResourceCollection.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResourceCollection.cs similarity index 77% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResourceCollection.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResourceCollection.cs index 2d95d4f4350..0eeb3fbedc1 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResourceCollection.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResourceCollection.cs @@ -15,7 +15,7 @@ using Azure.ResourceManager; using Azure.ResourceManager.Resources; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.CommonProperties { /// /// A class representing a collection of and their operations. @@ -24,8 +24,8 @@ namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity /// public partial class ManagedIdentityTrackedResourceCollection : ArmCollection { - private readonly ClientDiagnostics _managedIdentityTrackedResourceClientDiagnostics; - private readonly ManagedIdentityTrackedResourcesRestOperations _managedIdentityTrackedResourceRestClient; + private readonly ClientDiagnostics _managedIdentityTrackedResourceManagedIdentityClientDiagnostics; + private readonly ManagedIdentityRestOperations _managedIdentityTrackedResourceManagedIdentityRestClient; /// Initializes a new instance of the class for mocking. protected ManagedIdentityTrackedResourceCollection() @@ -37,9 +37,9 @@ protected ManagedIdentityTrackedResourceCollection() /// The identifier of the parent resource that is the target of operations. internal ManagedIdentityTrackedResourceCollection(ArmClient client, ResourceIdentifier id) : base(client, id) { - _managedIdentityTrackedResourceClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity", ManagedIdentityTrackedResource.ResourceType.Namespace, Diagnostics); - TryGetApiVersion(ManagedIdentityTrackedResource.ResourceType, out string managedIdentityTrackedResourceApiVersion); - _managedIdentityTrackedResourceRestClient = new ManagedIdentityTrackedResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, managedIdentityTrackedResourceApiVersion); + _managedIdentityTrackedResourceManagedIdentityClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.CommonProperties", ManagedIdentityTrackedResource.ResourceType.Namespace, Diagnostics); + TryGetApiVersion(ManagedIdentityTrackedResource.ResourceType, out string managedIdentityTrackedResourceManagedIdentityApiVersion); + _managedIdentityTrackedResourceManagedIdentityRestClient = new ManagedIdentityRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, managedIdentityTrackedResourceManagedIdentityApiVersion); #if DEBUG ValidateResourceId(Id); #endif @@ -56,7 +56,7 @@ internal static void ValidateResourceId(ResourceIdentifier id) /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -83,14 +83,14 @@ public virtual async Task> CreateOr Argument.AssertNotNullOrEmpty(managedIdentityTrackedResourceName, nameof(managedIdentityTrackedResourceName)); Argument.AssertNotNull(data, nameof(data)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.CreateOrUpdate"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.CreateOrUpdate"); scope.Start(); try { - var response = await _managedIdentityTrackedResourceRestClient.CreateWithSystemAssignedAsync(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, data, cancellationToken).ConfigureAwait(false); - var uri = _managedIdentityTrackedResourceRestClient.CreateCreateWithSystemAssignedRequestUri(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, data); + var response = await _managedIdentityTrackedResourceManagedIdentityRestClient.CreateWithSystemAssignedAsync(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, data, cancellationToken).ConfigureAwait(false); + var uri = _managedIdentityTrackedResourceManagedIdentityRestClient.CreateCreateWithSystemAssignedRequestUri(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, data); var rehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(RequestMethod.Put, uri.ToUri(), uri.ToString(), "None", null, OperationFinalStateVia.OriginalUri.ToString()); - var operation = new ManagedIdentityArmOperation(Response.FromValue(new ManagedIdentityTrackedResource(Client, response), response.GetRawResponse()), rehydrationToken); + var operation = new CommonPropertiesArmOperation(Response.FromValue(new ManagedIdentityTrackedResource(Client, response), response.GetRawResponse()), rehydrationToken); if (waitUntil == WaitUntil.Completed) await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false); return operation; @@ -107,7 +107,7 @@ public virtual async Task> CreateOr /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -134,14 +134,14 @@ public virtual ArmOperation CreateOrUpdate(WaitU Argument.AssertNotNullOrEmpty(managedIdentityTrackedResourceName, nameof(managedIdentityTrackedResourceName)); Argument.AssertNotNull(data, nameof(data)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.CreateOrUpdate"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.CreateOrUpdate"); scope.Start(); try { - var response = _managedIdentityTrackedResourceRestClient.CreateWithSystemAssigned(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, data, cancellationToken); - var uri = _managedIdentityTrackedResourceRestClient.CreateCreateWithSystemAssignedRequestUri(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, data); + var response = _managedIdentityTrackedResourceManagedIdentityRestClient.CreateWithSystemAssigned(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, data, cancellationToken); + var uri = _managedIdentityTrackedResourceManagedIdentityRestClient.CreateCreateWithSystemAssignedRequestUri(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, data); var rehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(RequestMethod.Put, uri.ToUri(), uri.ToString(), "None", null, OperationFinalStateVia.OriginalUri.ToString()); - var operation = new ManagedIdentityArmOperation(Response.FromValue(new ManagedIdentityTrackedResource(Client, response), response.GetRawResponse()), rehydrationToken); + var operation = new CommonPropertiesArmOperation(Response.FromValue(new ManagedIdentityTrackedResource(Client, response), response.GetRawResponse()), rehydrationToken); if (waitUntil == WaitUntil.Completed) operation.WaitForCompletion(cancellationToken); return operation; @@ -158,7 +158,7 @@ public virtual ArmOperation CreateOrUpdate(WaitU /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -182,11 +182,11 @@ public virtual async Task> GetAsync(str { Argument.AssertNotNullOrEmpty(managedIdentityTrackedResourceName, nameof(managedIdentityTrackedResourceName)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.Get"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.Get"); scope.Start(); try { - var response = await _managedIdentityTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken).ConfigureAwait(false); + var response = await _managedIdentityTrackedResourceManagedIdentityRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken).ConfigureAwait(false); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new ManagedIdentityTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -203,7 +203,7 @@ public virtual async Task> GetAsync(str /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -227,11 +227,11 @@ public virtual Response Get(string managedIdenti { Argument.AssertNotNullOrEmpty(managedIdentityTrackedResourceName, nameof(managedIdentityTrackedResourceName)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.Get"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.Get"); scope.Start(); try { - var response = _managedIdentityTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken); + var response = _managedIdentityTrackedResourceManagedIdentityRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new ManagedIdentityTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -248,7 +248,7 @@ public virtual Response Get(string managedIdenti /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -272,11 +272,11 @@ public virtual async Task> ExistsAsync(string managedIdentityTrac { Argument.AssertNotNullOrEmpty(managedIdentityTrackedResourceName, nameof(managedIdentityTrackedResourceName)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.Exists"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.Exists"); scope.Start(); try { - var response = await _managedIdentityTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); + var response = await _managedIdentityTrackedResourceManagedIdentityRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); return Response.FromValue(response.Value != null, response.GetRawResponse()); } catch (Exception e) @@ -291,7 +291,7 @@ public virtual async Task> ExistsAsync(string managedIdentityTrac /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -315,11 +315,11 @@ public virtual Response Exists(string managedIdentityTrackedResourceName, { Argument.AssertNotNullOrEmpty(managedIdentityTrackedResourceName, nameof(managedIdentityTrackedResourceName)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.Exists"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.Exists"); scope.Start(); try { - var response = _managedIdentityTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken: cancellationToken); + var response = _managedIdentityTrackedResourceManagedIdentityRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken: cancellationToken); return Response.FromValue(response.Value != null, response.GetRawResponse()); } catch (Exception e) @@ -334,7 +334,7 @@ public virtual Response Exists(string managedIdentityTrackedResourceName, /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -358,11 +358,11 @@ public virtual async Task> GetI { Argument.AssertNotNullOrEmpty(managedIdentityTrackedResourceName, nameof(managedIdentityTrackedResourceName)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.GetIfExists"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.GetIfExists"); scope.Start(); try { - var response = await _managedIdentityTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); + var response = await _managedIdentityTrackedResourceManagedIdentityRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); if (response.Value == null) return new NoValueResponse(response.GetRawResponse()); return Response.FromValue(new ManagedIdentityTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -379,7 +379,7 @@ public virtual async Task> GetI /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName} /// /// /// Operation Id @@ -403,11 +403,11 @@ public virtual NullableResponse GetIfExists(stri { Argument.AssertNotNullOrEmpty(managedIdentityTrackedResourceName, nameof(managedIdentityTrackedResourceName)); - using var scope = _managedIdentityTrackedResourceClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.GetIfExists"); + using var scope = _managedIdentityTrackedResourceManagedIdentityClientDiagnostics.CreateScope("ManagedIdentityTrackedResourceCollection.GetIfExists"); scope.Start(); try { - var response = _managedIdentityTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken: cancellationToken); + var response = _managedIdentityTrackedResourceManagedIdentityRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, managedIdentityTrackedResourceName, cancellationToken: cancellationToken); if (response.Value == null) return new NoValueResponse(response.GetRawResponse()); return Response.FromValue(new ManagedIdentityTrackedResource(Client, response.Value), response.GetRawResponse()); diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResourceData.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResourceData.Serialization.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResourceData.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResourceData.Serialization.cs index e82f601bbe9..a364d6b8618 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResourceData.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResourceData.Serialization.cs @@ -11,9 +11,9 @@ using System.Text.Json; using Azure.Core; using Azure.ResourceManager.Models; -using _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Models; +using _Azure.ResourceManager.CommonProperties.Models; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.CommonProperties { public partial class ManagedIdentityTrackedResourceData : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResourceData.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResourceData.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResourceData.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResourceData.cs index e40c716d16c..26d4b9aeb6d 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ManagedIdentityTrackedResourceData.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ManagedIdentityTrackedResourceData.cs @@ -9,9 +9,9 @@ using System.Collections.Generic; using Azure.Core; using Azure.ResourceManager.Models; -using _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Models; +using _Azure.ResourceManager.CommonProperties.Models; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.CommonProperties { /// /// A class representing the ManagedIdentityTrackedResource data model. diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Models/ManagedIdentityTrackedResourceProperties.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Models/ManagedIdentityTrackedResourceProperties.Serialization.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Models/ManagedIdentityTrackedResourceProperties.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Models/ManagedIdentityTrackedResourceProperties.Serialization.cs index 5614d4e67e4..c3e14d7223f 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Models/ManagedIdentityTrackedResourceProperties.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Models/ManagedIdentityTrackedResourceProperties.Serialization.cs @@ -11,7 +11,7 @@ using System.Text.Json; using Azure.Core; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Models +namespace _Azure.ResourceManager.CommonProperties.Models { internal partial class ManagedIdentityTrackedResourceProperties : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Models/ManagedIdentityTrackedResourceProperties.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Models/ManagedIdentityTrackedResourceProperties.cs similarity index 97% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Models/ManagedIdentityTrackedResourceProperties.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Models/ManagedIdentityTrackedResourceProperties.cs index a62c711e772..80ab64c89e9 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Models/ManagedIdentityTrackedResourceProperties.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Models/ManagedIdentityTrackedResourceProperties.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Models +namespace _Azure.ResourceManager.CommonProperties.Models { /// Managed Identity Arm Resource Properties. internal partial class ManagedIdentityTrackedResourceProperties diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/ProviderConstants.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ProviderConstants.cs similarity index 88% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/ProviderConstants.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ProviderConstants.cs index 6a83bd6d1ae..7d4f1250ccd 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/ProviderConstants.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/ProviderConstants.cs @@ -7,7 +7,7 @@ using Azure.Core.Pipeline; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.CommonProperties { internal static class ProviderConstants { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/RestOperations/ManagedIdentityTrackedResourcesRestOperations.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/RestOperations/ManagedIdentityRestOperations.cs similarity index 94% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/RestOperations/ManagedIdentityTrackedResourcesRestOperations.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/RestOperations/ManagedIdentityRestOperations.cs index 070229b9175..501e5deb877 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/RestOperations/ManagedIdentityTrackedResourcesRestOperations.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/RestOperations/ManagedIdentityRestOperations.cs @@ -13,22 +13,22 @@ using Azure.Core; using Azure.Core.Pipeline; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.CommonProperties { - internal partial class ManagedIdentityTrackedResourcesRestOperations + internal partial class ManagedIdentityRestOperations { private readonly TelemetryDetails _userAgent; private readonly HttpPipeline _pipeline; private readonly Uri _endpoint; private readonly string _apiVersion; - /// Initializes a new instance of ManagedIdentityTrackedResourcesRestOperations. + /// Initializes a new instance of ManagedIdentityRestOperations. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The application id to use for user agent. /// Service host. /// The API version to use for this operation. /// or is null. - public ManagedIdentityTrackedResourcesRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default) + public ManagedIdentityRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default) { _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); _endpoint = endpoint ?? new Uri("https://management.azure.com"); @@ -44,7 +44,7 @@ internal RequestUriBuilder CreateGetRequestUri(string subscriptionId, string res uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/", false); uri.AppendPath(managedIdentityTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); return uri; @@ -61,7 +61,7 @@ internal HttpMessage CreateGetRequest(string subscriptionId, string resourceGrou uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/", false); uri.AppendPath(managedIdentityTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; @@ -140,7 +140,7 @@ internal RequestUriBuilder CreateCreateWithSystemAssignedRequestUri(string subsc uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/", false); uri.AppendPath(managedIdentityTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); return uri; @@ -157,7 +157,7 @@ internal HttpMessage CreateCreateWithSystemAssignedRequest(string subscriptionId uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/", false); uri.AppendPath(managedIdentityTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; @@ -242,7 +242,7 @@ internal RequestUriBuilder CreateUpdateWithUserAssignedAndSystemAssignedRequestU uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/", false); uri.AppendPath(managedIdentityTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); return uri; @@ -259,7 +259,7 @@ internal HttpMessage CreateUpdateWithUserAssignedAndSystemAssignedRequest(string uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/", false); uri.AppendPath(managedIdentityTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Properties/AssemblyInfo.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Properties/AssemblyInfo.cs similarity index 76% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Properties/AssemblyInfo.cs rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/Properties/AssemblyInfo.cs index 71131739904..1aa57de7bce 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Properties/AssemblyInfo.cs +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Properties/AssemblyInfo.cs @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("_Azure.ResourceManager.Models.Resources.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")] +[assembly: InternalsVisibleTo("_Azure.ResourceManager.CommonProperties.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")] diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/_Azure.ResourceManager.Models.Resources.csproj b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/_Azure.ResourceManager.CommonProperties.csproj similarity index 58% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/_Azure.ResourceManager.Models.Resources.csproj rename to test/CadlRanchProjects/azure/resource-manager/common-properties/src/_Azure.ResourceManager.CommonProperties.csproj index c6c37f47c8f..7206cdd951f 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/_Azure.ResourceManager.Models.Resources.csproj +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/_Azure.ResourceManager.CommonProperties.csproj @@ -1,9 +1,9 @@ - This is the _Azure.ResourceManager.Models.Resources client library for developing .NET applications with rich experience. - Azure SDK Code Generation _Azure.ResourceManager.Models.Resources for Azure Data Plane + This is the _Azure.ResourceManager.CommonProperties client library for developing .NET applications with rich experience. + Azure SDK Code Generation _Azure.ResourceManager.CommonProperties for Azure Data Plane 1.0.0-beta.1 - _Azure.ResourceManager.Models.Resources + _Azure.ResourceManager.CommonProperties $(RequiredTargetFrameworks) true diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/tests/_Azure.ResourceManager.Models.Resources.Tests.csproj b/test/CadlRanchProjects/azure/resource-manager/common-properties/tests/_Azure.ResourceManager.CommonProperties.Tests.csproj similarity index 76% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/tests/_Azure.ResourceManager.Models.Resources.Tests.csproj rename to test/CadlRanchProjects/azure/resource-manager/common-properties/tests/_Azure.ResourceManager.CommonProperties.Tests.csproj index 3d17b784ca7..011d42eba7d 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/tests/_Azure.ResourceManager.Models.Resources.Tests.csproj +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/tests/_Azure.ResourceManager.CommonProperties.Tests.csproj @@ -6,6 +6,6 @@ - + diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/tspCodeModel.json b/test/CadlRanchProjects/azure/resource-manager/common-properties/tspCodeModel.json similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/tspCodeModel.json rename to test/CadlRanchProjects/azure/resource-manager/common-properties/tspCodeModel.json index dc40f03b6ec..97ad6c5735a 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/tspCodeModel.json +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/tspCodeModel.json @@ -1,6 +1,6 @@ { "$id": "1", - "Name": "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity", + "Name": "Azure.ResourceManager.CommonProperties", "ApiVersions": [ "2023-12-01-preview" ], @@ -193,7 +193,7 @@ "$id": "22", "kind": "enum", "name": "Versions", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Versions", + "crossLanguageDefinitionId": "Azure.ResourceManager.CommonProperties.Versions", "valueType": { "$id": "23", "kind": "string", @@ -233,7 +233,7 @@ "$id": "26", "kind": "model", "name": "ManagedIdentityTrackedResource", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.ManagedIdentityTrackedResource", + "crossLanguageDefinitionId": "Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResource", "usage": "Input,Output,Json", "description": "Concrete tracked resource types can be created by aliasing this type using a specific property type.", "decorators": [], @@ -534,7 +534,7 @@ "$id": "56", "kind": "model", "name": "ManagedIdentityTrackedResourceProperties", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.ManagedIdentityTrackedResourceProperties", + "crossLanguageDefinitionId": "Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResourceProperties", "usage": "Input,Output,Json", "description": "Managed Identity Arm Resource Properties.", "decorators": [], @@ -557,7 +557,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.ManagedIdentityTrackedResourceProperties.provisioningState" + "crossLanguageDefinitionId": "Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResourceProperties.provisioningState" } ] }, @@ -566,7 +566,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.ManagedIdentityTrackedResource.properties" + "crossLanguageDefinitionId": "Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResource.properties" }, { "$id": "59", @@ -750,7 +750,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.ManagedIdentityTrackedResource.identity" + "crossLanguageDefinitionId": "Azure.ResourceManager.CommonProperties.ManagedIdentityTrackedResource.identity" } ] }, @@ -976,7 +976,7 @@ "Clients": [ { "$id": "96", - "Name": "ManagedIdentityClient", + "Name": "CommonPropertiesClient", "Description": "Arm Managed Identity Provider management API.", "Operations": [], "Protocol": { @@ -1019,7 +1019,7 @@ }, { "$id": "102", - "Name": "ManagedIdentityTrackedResources", + "Name": "ManagedIdentity", "Operations": [ { "$id": "103", @@ -1205,11 +1205,11 @@ "HttpMethod": "GET", "RequestBodyMediaType": "None", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}", "BufferResponse": true, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.ManagedIdentityTrackedResources.get", + "CrossLanguageDefinitionId": "Azure.ResourceManager.CommonProperties.ManagedIdentity.get", "Decorators": [] }, { @@ -1429,14 +1429,14 @@ "HttpMethod": "PUT", "RequestBodyMediaType": "Json", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}", "RequestMediaTypes": [ "application/json" ], "BufferResponse": true, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.ManagedIdentityTrackedResources.createWithSystemAssigned", + "CrossLanguageDefinitionId": "Azure.ResourceManager.CommonProperties.ManagedIdentity.createWithSystemAssigned", "Decorators": [] }, { @@ -1641,21 +1641,21 @@ "HttpMethod": "PATCH", "RequestBodyMediaType": "Json", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}", "RequestMediaTypes": [ "application/json" ], "BufferResponse": true, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": false, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.ManagedIdentityTrackedResources.updateWithUserAssignedAndSystemAssigned", + "CrossLanguageDefinitionId": "Azure.ResourceManager.CommonProperties.ManagedIdentity.updateWithUserAssignedAndSystemAssigned", "Decorators": [] } ], "Protocol": { "$id": "161" }, - "Parent": "ManagedIdentityClient", + "Parent": "CommonPropertiesClient", "Parameters": [ { "$ref": "104" diff --git a/test/CadlRanchProjects/azure/resource-manager/common-properties/tspconfig.yaml b/test/CadlRanchProjects/azure/resource-manager/common-properties/tspconfig.yaml new file mode 100644 index 00000000000..37031df8186 --- /dev/null +++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/tspconfig.yaml @@ -0,0 +1,3 @@ +options: + "@azure-tools/typespec-csharp": + namespace: _Azure.ResourceManager.CommonProperties \ No newline at end of file diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/Configuration.json b/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/Configuration.json deleted file mode 100644 index 84d1ca01c77..00000000000 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/Configuration.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "output-folder": ".", - "namespace": "_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity", - "library-name": "_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity", - "flavor": "azure", - "use-model-reader-writer": true, - "shared-source-folders": [ - "../../../../../../../../../artifacts/bin/AutoRest.CSharp/Debug/net8.0/Generator.Shared", - "../../../../../../../../../artifacts/bin/AutoRest.CSharp/Debug/net8.0/Azure.Core.Shared" - ], - "azure-arm": true -} diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Properties/AssemblyInfo.cs b/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Properties/AssemblyInfo.cs deleted file mode 100644 index 72bc1d4cb64..00000000000 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")] diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.csproj b/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.csproj deleted file mode 100644 index e433bf64db7..00000000000 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - This is the _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity client library for developing .NET applications with rich experience. - Azure SDK Code Generation _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity for Azure Data Plane - 1.0.0-beta.1 - _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity - $(RequiredTargetFrameworks) - true - - diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/tspconfig.yaml b/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/tspconfig.yaml deleted file mode 100644 index fcc7c2708cd..00000000000 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/tspconfig.yaml +++ /dev/null @@ -1,3 +0,0 @@ -options: - "@azure-tools/typespec-csharp": - namespace: _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/Configuration.json b/test/CadlRanchProjects/azure/resource-manager/models/resources/Configuration.json deleted file mode 100644 index 3dae92d419c..00000000000 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/Configuration.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "output-folder": ".", - "namespace": "_Azure.ResourceManager.Models.Resources", - "library-name": "_Azure.ResourceManager.Models.Resources", - "flavor": "azure", - "use-model-reader-writer": true, - "shared-source-folders": [ - "../../../../../../../../artifacts/bin/AutoRest.CSharp/Debug/net8.0/Generator.Shared", - "../../../../../../../../artifacts/bin/AutoRest.CSharp/Debug/net8.0/Azure.Core.Shared" - ], - "azure-arm": true -} diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/tspconfig.yaml b/test/CadlRanchProjects/azure/resource-manager/models/resources/tspconfig.yaml deleted file mode 100644 index acbec948da1..00000000000 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/tspconfig.yaml +++ /dev/null @@ -1,3 +0,0 @@ -options: - "@azure-tools/typespec-csharp": - namespace: _Azure.ResourceManager.Models.Resources \ No newline at end of file diff --git a/test/CadlRanchProjects/azure/resource-manager/resources/Configuration.json b/test/CadlRanchProjects/azure/resource-manager/resources/Configuration.json new file mode 100644 index 00000000000..6f103fb1f06 --- /dev/null +++ b/test/CadlRanchProjects/azure/resource-manager/resources/Configuration.json @@ -0,0 +1,12 @@ +{ + "output-folder": ".", + "namespace": "_Azure.ResourceManager.Resources", + "library-name": "_Azure.ResourceManager.Resources", + "flavor": "azure", + "use-model-reader-writer": true, + "shared-source-folders": [ + "../../../../../../../artifacts/bin/AutoRest.CSharp/Debug/net8.0/Generator.Shared", + "../../../../../../../artifacts/bin/AutoRest.CSharp/Debug/net8.0/Azure.Core.Shared" + ], + "azure-arm": true +} diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.sln b/test/CadlRanchProjects/azure/resource-manager/resources/_Azure.ResourceManager.Resources.sln similarity index 90% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.sln rename to test/CadlRanchProjects/azure/resource-manager/resources/_Azure.ResourceManager.Resources.sln index 43cb77b04f6..c9c39b809a9 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.sln +++ b/test/CadlRanchProjects/azure/resource-manager/resources/_Azure.ResourceManager.Resources.sln @@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity", "src\_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Azure.ResourceManager.Resources", "src\_Azure.ResourceManager.Resources.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Tests", "tests\_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Tests.csproj", "{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_Azure.ResourceManager.Resources.Tests", "tests\_Azure.ResourceManager.Resources.Tests.csproj", "{1F1CD1D4-9932-4B73-99D8-C252A67D4B46}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/ArmAzureResourceManagerModelsResourcesModelFactory.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/ArmAzureResourceManagerResourcesModelFactory.cs similarity index 97% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/ArmAzureResourceManagerModelsResourcesModelFactory.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/ArmAzureResourceManagerResourcesModelFactory.cs index 297fd1b411a..a06b91c668d 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/ArmAzureResourceManagerModelsResourcesModelFactory.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/ArmAzureResourceManagerResourcesModelFactory.cs @@ -12,10 +12,10 @@ using Azure.Core; using Azure.ResourceManager.Models; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { /// Model factory for models. - public static partial class ArmAzureResourceManagerModelsResourcesModelFactory + public static partial class ArmAzureResourceManagerResourcesModelFactory { /// Initializes a new instance of . /// The id. diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/Mockable_AzureResourceManagerModelsResourcesArmClient.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/Mockable_AzureResourceManagerResourcesArmClient.cs similarity index 83% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/Mockable_AzureResourceManagerModelsResourcesArmClient.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/Mockable_AzureResourceManagerResourcesArmClient.cs index fefc7efc401..832e412b41a 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/Mockable_AzureResourceManagerModelsResourcesArmClient.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/Mockable_AzureResourceManagerResourcesArmClient.cs @@ -8,24 +8,24 @@ using Azure.Core; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.Resources.Mocking +namespace _Azure.ResourceManager.Resources.Mocking { /// A class to add extension methods to ArmClient. - public partial class Mockable_AzureResourceManagerModelsResourcesArmClient : ArmResource + public partial class Mockable_AzureResourceManagerResourcesArmClient : ArmResource { - /// Initializes a new instance of the class for mocking. - protected Mockable_AzureResourceManagerModelsResourcesArmClient() + /// Initializes a new instance of the class for mocking. + protected Mockable_AzureResourceManagerResourcesArmClient() { } - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// The client parameters to use in these operations. /// The identifier of the resource that is the target of operations. - internal Mockable_AzureResourceManagerModelsResourcesArmClient(ArmClient client, ResourceIdentifier id) : base(client, id) + internal Mockable_AzureResourceManagerResourcesArmClient(ArmClient client, ResourceIdentifier id) : base(client, id) { } - internal Mockable_AzureResourceManagerModelsResourcesArmClient(ArmClient client) : this(client, ResourceIdentifier.Root) + internal Mockable_AzureResourceManagerResourcesArmClient(ArmClient client) : this(client, ResourceIdentifier.Root) { } diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/Mockable_AzureResourceManagerModelsResourcesResourceGroupResource.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/Mockable_AzureResourceManagerResourcesResourceGroupResource.cs similarity index 83% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/Mockable_AzureResourceManagerModelsResourcesResourceGroupResource.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/Mockable_AzureResourceManagerResourcesResourceGroupResource.cs index 6765f60877b..88cad55b102 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/Mockable_AzureResourceManagerModelsResourcesResourceGroupResource.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/Mockable_AzureResourceManagerResourcesResourceGroupResource.cs @@ -12,20 +12,20 @@ using Azure.Core; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.Resources.Mocking +namespace _Azure.ResourceManager.Resources.Mocking { /// A class to add extension methods to ResourceGroupResource. - public partial class Mockable_AzureResourceManagerModelsResourcesResourceGroupResource : ArmResource + public partial class Mockable_AzureResourceManagerResourcesResourceGroupResource : ArmResource { - /// Initializes a new instance of the class for mocking. - protected Mockable_AzureResourceManagerModelsResourcesResourceGroupResource() + /// Initializes a new instance of the class for mocking. + protected Mockable_AzureResourceManagerResourcesResourceGroupResource() { } - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// The client parameters to use in these operations. /// The identifier of the resource that is the target of operations. - internal Mockable_AzureResourceManagerModelsResourcesResourceGroupResource(ArmClient client, ResourceIdentifier id) : base(client, id) + internal Mockable_AzureResourceManagerResourcesResourceGroupResource(ArmClient client, ResourceIdentifier id) : base(client, id) { } @@ -47,7 +47,7 @@ public virtual TopLevelTrackedResourceCollection GetTopLevelTrackedResources() /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -78,7 +78,7 @@ public virtual async Task> GetTopLevelTrackedR /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -108,7 +108,7 @@ public virtual Response GetTopLevelTrackedResource(stri /// Returns a object. public virtual SingletonTrackedResource GetSingletonTrackedResource() { - return new SingletonTrackedResource(Client, Id.AppendProviderResource("Azure.ResourceManager.Models.Resources", "singletonTrackedResources", "default")); + return new SingletonTrackedResource(Client, Id.AppendProviderResource("Azure.ResourceManager.Resources", "singletonTrackedResources", "default")); } } } diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/Mockable_AzureResourceManagerModelsResourcesSubscriptionResource.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/Mockable_AzureResourceManagerResourcesSubscriptionResource.cs similarity index 63% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/Mockable_AzureResourceManagerModelsResourcesSubscriptionResource.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/Mockable_AzureResourceManagerResourcesSubscriptionResource.cs index ee98c6ace65..9e72e1795cd 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/Mockable_AzureResourceManagerModelsResourcesSubscriptionResource.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/Mockable_AzureResourceManagerResourcesSubscriptionResource.cs @@ -12,28 +12,28 @@ using Azure.Core.Pipeline; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.Resources.Mocking +namespace _Azure.ResourceManager.Resources.Mocking { /// A class to add extension methods to SubscriptionResource. - public partial class Mockable_AzureResourceManagerModelsResourcesSubscriptionResource : ArmResource + public partial class Mockable_AzureResourceManagerResourcesSubscriptionResource : ArmResource { - private ClientDiagnostics _topLevelTrackedResourceClientDiagnostics; - private TopLevelTrackedResourcesRestOperations _topLevelTrackedResourceRestClient; + private ClientDiagnostics _topLevelTrackedResourceTopLevelClientDiagnostics; + private TopLevelRestOperations _topLevelTrackedResourceTopLevelRestClient; - /// Initializes a new instance of the class for mocking. - protected Mockable_AzureResourceManagerModelsResourcesSubscriptionResource() + /// Initializes a new instance of the class for mocking. + protected Mockable_AzureResourceManagerResourcesSubscriptionResource() { } - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// The client parameters to use in these operations. /// The identifier of the resource that is the target of operations. - internal Mockable_AzureResourceManagerModelsResourcesSubscriptionResource(ArmClient client, ResourceIdentifier id) : base(client, id) + internal Mockable_AzureResourceManagerResourcesSubscriptionResource(ArmClient client, ResourceIdentifier id) : base(client, id) { } - private ClientDiagnostics TopLevelTrackedResourceClientDiagnostics => _topLevelTrackedResourceClientDiagnostics ??= new ClientDiagnostics("_Azure.ResourceManager.Models.Resources", TopLevelTrackedResource.ResourceType.Namespace, Diagnostics); - private TopLevelTrackedResourcesRestOperations TopLevelTrackedResourceRestClient => _topLevelTrackedResourceRestClient ??= new TopLevelTrackedResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, GetApiVersionOrNull(TopLevelTrackedResource.ResourceType)); + private ClientDiagnostics TopLevelTrackedResourceTopLevelClientDiagnostics => _topLevelTrackedResourceTopLevelClientDiagnostics ??= new ClientDiagnostics("_Azure.ResourceManager.Resources", TopLevelTrackedResource.ResourceType.Namespace, Diagnostics); + private TopLevelRestOperations TopLevelTrackedResourceTopLevelRestClient => _topLevelTrackedResourceTopLevelRestClient ??= new TopLevelRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, GetApiVersionOrNull(TopLevelTrackedResource.ResourceType)); private string GetApiVersionOrNull(ResourceType resourceType) { @@ -46,7 +46,7 @@ private string GetApiVersionOrNull(ResourceType resourceType) /// /// /// Request Path - /// /subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources + /// /subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources /// /// /// Operation Id @@ -66,9 +66,9 @@ private string GetApiVersionOrNull(ResourceType resourceType) /// An async collection of that may take multiple service requests to iterate over. public virtual AsyncPageable GetTopLevelTrackedResourcesAsync(CancellationToken cancellationToken = default) { - HttpMessage FirstPageRequest(int? pageSizeHint) => TopLevelTrackedResourceRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => TopLevelTrackedResourceRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new TopLevelTrackedResource(Client, TopLevelTrackedResourceData.DeserializeTopLevelTrackedResourceData(e)), TopLevelTrackedResourceClientDiagnostics, Pipeline, "Mockable_AzureResourceManagerModelsResourcesSubscriptionResource.GetTopLevelTrackedResources", "value", "nextLink", cancellationToken); + HttpMessage FirstPageRequest(int? pageSizeHint) => TopLevelTrackedResourceTopLevelRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => TopLevelTrackedResourceTopLevelRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId); + return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new TopLevelTrackedResource(Client, TopLevelTrackedResourceData.DeserializeTopLevelTrackedResourceData(e)), TopLevelTrackedResourceTopLevelClientDiagnostics, Pipeline, "Mockable_AzureResourceManagerResourcesSubscriptionResource.GetTopLevelTrackedResources", "value", "nextLink", cancellationToken); } /// @@ -76,7 +76,7 @@ public virtual AsyncPageable GetTopLevelTrackedResource /// /// /// Request Path - /// /subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources + /// /subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources /// /// /// Operation Id @@ -96,9 +96,9 @@ public virtual AsyncPageable GetTopLevelTrackedResource /// A collection of that may take multiple service requests to iterate over. public virtual Pageable GetTopLevelTrackedResources(CancellationToken cancellationToken = default) { - HttpMessage FirstPageRequest(int? pageSizeHint) => TopLevelTrackedResourceRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => TopLevelTrackedResourceRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new TopLevelTrackedResource(Client, TopLevelTrackedResourceData.DeserializeTopLevelTrackedResourceData(e)), TopLevelTrackedResourceClientDiagnostics, Pipeline, "Mockable_AzureResourceManagerModelsResourcesSubscriptionResource.GetTopLevelTrackedResources", "value", "nextLink", cancellationToken); + HttpMessage FirstPageRequest(int? pageSizeHint) => TopLevelTrackedResourceTopLevelRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => TopLevelTrackedResourceTopLevelRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId); + return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new TopLevelTrackedResource(Client, TopLevelTrackedResourceData.DeserializeTopLevelTrackedResourceData(e)), TopLevelTrackedResourceTopLevelClientDiagnostics, Pipeline, "Mockable_AzureResourceManagerResourcesSubscriptionResource.GetTopLevelTrackedResources", "value", "nextLink", cancellationToken); } } } diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/_AzureResourceManagerModelsResourcesExtensions.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/_AzureResourceManagerResourcesExtensions.cs similarity index 76% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/_AzureResourceManagerModelsResourcesExtensions.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/_AzureResourceManagerResourcesExtensions.cs index 0ee74f8e8aa..25458a92774 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Extensions/_AzureResourceManagerModelsResourcesExtensions.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Extensions/_AzureResourceManagerResourcesExtensions.cs @@ -12,26 +12,26 @@ using Azure.Core; using Azure.ResourceManager; using Azure.ResourceManager.Resources; -using _Azure.ResourceManager.Models.Resources.Mocking; +using _Azure.ResourceManager.Resources.Mocking; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { - /// A class to add extension methods to _Azure.ResourceManager.Models.Resources. - public static partial class _AzureResourceManagerModelsResourcesExtensions + /// A class to add extension methods to _Azure.ResourceManager.Resources. + public static partial class _AzureResourceManagerResourcesExtensions { - private static Mockable_AzureResourceManagerModelsResourcesArmClient GetMockable_AzureResourceManagerModelsResourcesArmClient(ArmClient client) + private static Mockable_AzureResourceManagerResourcesArmClient GetMockable_AzureResourceManagerResourcesArmClient(ArmClient client) { - return client.GetCachedClient(client0 => new Mockable_AzureResourceManagerModelsResourcesArmClient(client0)); + return client.GetCachedClient(client0 => new Mockable_AzureResourceManagerResourcesArmClient(client0)); } - private static Mockable_AzureResourceManagerModelsResourcesResourceGroupResource GetMockable_AzureResourceManagerModelsResourcesResourceGroupResource(ArmResource resource) + private static Mockable_AzureResourceManagerResourcesResourceGroupResource GetMockable_AzureResourceManagerResourcesResourceGroupResource(ArmResource resource) { - return resource.GetCachedClient(client => new Mockable_AzureResourceManagerModelsResourcesResourceGroupResource(client, resource.Id)); + return resource.GetCachedClient(client => new Mockable_AzureResourceManagerResourcesResourceGroupResource(client, resource.Id)); } - private static Mockable_AzureResourceManagerModelsResourcesSubscriptionResource GetMockable_AzureResourceManagerModelsResourcesSubscriptionResource(ArmResource resource) + private static Mockable_AzureResourceManagerResourcesSubscriptionResource GetMockable_AzureResourceManagerResourcesSubscriptionResource(ArmResource resource) { - return resource.GetCachedClient(client => new Mockable_AzureResourceManagerModelsResourcesSubscriptionResource(client, resource.Id)); + return resource.GetCachedClient(client => new Mockable_AzureResourceManagerResourcesSubscriptionResource(client, resource.Id)); } /// @@ -39,7 +39,7 @@ private static Mockable_AzureResourceManagerModelsResourcesSubscriptionResource /// You can use to create a from its components. /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -50,7 +50,7 @@ public static TopLevelTrackedResource GetTopLevelTrackedResource(this ArmClient { Argument.AssertNotNull(client, nameof(client)); - return GetMockable_AzureResourceManagerModelsResourcesArmClient(client).GetTopLevelTrackedResource(id); + return GetMockable_AzureResourceManagerResourcesArmClient(client).GetTopLevelTrackedResource(id); } /// @@ -58,7 +58,7 @@ public static TopLevelTrackedResource GetTopLevelTrackedResource(this ArmClient /// You can use to create a from its components. /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -69,7 +69,7 @@ public static NestedProxyResource GetNestedProxyResource(this ArmClient client, { Argument.AssertNotNull(client, nameof(client)); - return GetMockable_AzureResourceManagerModelsResourcesArmClient(client).GetNestedProxyResource(id); + return GetMockable_AzureResourceManagerResourcesArmClient(client).GetNestedProxyResource(id); } /// @@ -77,7 +77,7 @@ public static NestedProxyResource GetNestedProxyResource(this ArmClient client, /// You can use to create a from its components. /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -88,14 +88,14 @@ public static SingletonTrackedResource GetSingletonTrackedResource(this ArmClien { Argument.AssertNotNull(client, nameof(client)); - return GetMockable_AzureResourceManagerModelsResourcesArmClient(client).GetSingletonTrackedResource(id); + return GetMockable_AzureResourceManagerResourcesArmClient(client).GetSingletonTrackedResource(id); } /// /// Gets a collection of TopLevelTrackedResources in the ResourceGroupResource. /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -105,7 +105,7 @@ public static TopLevelTrackedResourceCollection GetTopLevelTrackedResources(this { Argument.AssertNotNull(resourceGroupResource, nameof(resourceGroupResource)); - return GetMockable_AzureResourceManagerModelsResourcesResourceGroupResource(resourceGroupResource).GetTopLevelTrackedResources(); + return GetMockable_AzureResourceManagerResourcesResourceGroupResource(resourceGroupResource).GetTopLevelTrackedResources(); } /// @@ -113,7 +113,7 @@ public static TopLevelTrackedResourceCollection GetTopLevelTrackedResources(this /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -130,7 +130,7 @@ public static TopLevelTrackedResourceCollection GetTopLevelTrackedResources(this /// /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -143,7 +143,7 @@ public static async Task> GetTopLevelTrackedRe { Argument.AssertNotNull(resourceGroupResource, nameof(resourceGroupResource)); - return await GetMockable_AzureResourceManagerModelsResourcesResourceGroupResource(resourceGroupResource).GetTopLevelTrackedResourceAsync(topLevelTrackedResourceName, cancellationToken).ConfigureAwait(false); + return await GetMockable_AzureResourceManagerResourcesResourceGroupResource(resourceGroupResource).GetTopLevelTrackedResourceAsync(topLevelTrackedResourceName, cancellationToken).ConfigureAwait(false); } /// @@ -151,7 +151,7 @@ public static async Task> GetTopLevelTrackedRe /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -168,7 +168,7 @@ public static async Task> GetTopLevelTrackedRe /// /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -181,14 +181,14 @@ public static Response GetTopLevelTrackedResource(this { Argument.AssertNotNull(resourceGroupResource, nameof(resourceGroupResource)); - return GetMockable_AzureResourceManagerModelsResourcesResourceGroupResource(resourceGroupResource).GetTopLevelTrackedResource(topLevelTrackedResourceName, cancellationToken); + return GetMockable_AzureResourceManagerResourcesResourceGroupResource(resourceGroupResource).GetTopLevelTrackedResource(topLevelTrackedResourceName, cancellationToken); } /// /// Gets an object representing a SingletonTrackedResource along with the instance operations that can be performed on it in the ResourceGroupResource. /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -198,7 +198,7 @@ public static SingletonTrackedResource GetSingletonTrackedResource(this Resource { Argument.AssertNotNull(resourceGroupResource, nameof(resourceGroupResource)); - return GetMockable_AzureResourceManagerModelsResourcesResourceGroupResource(resourceGroupResource).GetSingletonTrackedResource(); + return GetMockable_AzureResourceManagerResourcesResourceGroupResource(resourceGroupResource).GetSingletonTrackedResource(); } /// @@ -206,7 +206,7 @@ public static SingletonTrackedResource GetSingletonTrackedResource(this Resource /// /// /// Request Path - /// /subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources + /// /subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources /// /// /// Operation Id @@ -223,7 +223,7 @@ public static SingletonTrackedResource GetSingletonTrackedResource(this Resource /// /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -234,7 +234,7 @@ public static AsyncPageable GetTopLevelTrackedResources { Argument.AssertNotNull(subscriptionResource, nameof(subscriptionResource)); - return GetMockable_AzureResourceManagerModelsResourcesSubscriptionResource(subscriptionResource).GetTopLevelTrackedResourcesAsync(cancellationToken); + return GetMockable_AzureResourceManagerResourcesSubscriptionResource(subscriptionResource).GetTopLevelTrackedResourcesAsync(cancellationToken); } /// @@ -242,7 +242,7 @@ public static AsyncPageable GetTopLevelTrackedResources /// /// /// Request Path - /// /subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources + /// /subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources /// /// /// Operation Id @@ -259,7 +259,7 @@ public static AsyncPageable GetTopLevelTrackedResources /// /// /// Mocking - /// To mock this method, please mock instead. + /// To mock this method, please mock instead. /// /// /// The instance the method will execute against. @@ -270,7 +270,7 @@ public static Pageable GetTopLevelTrackedResources(this { Argument.AssertNotNull(subscriptionResource, nameof(subscriptionResource)); - return GetMockable_AzureResourceManagerModelsResourcesSubscriptionResource(subscriptionResource).GetTopLevelTrackedResources(cancellationToken); + return GetMockable_AzureResourceManagerResourcesSubscriptionResource(subscriptionResource).GetTopLevelTrackedResources(cancellationToken); } } } diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/Argument.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/Argument.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/Argument.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/Argument.cs index 063bd9b1a0d..1503c59d19a 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/Argument.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/Argument.cs @@ -9,7 +9,7 @@ using System.Collections; using System.Collections.Generic; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.Resources { internal static class Argument { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/ChangeTrackingDictionary.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/ChangeTrackingDictionary.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/ChangeTrackingDictionary.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/ChangeTrackingDictionary.cs index 6fae26b2ba4..3eddd97d701 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/ChangeTrackingDictionary.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/ChangeTrackingDictionary.cs @@ -9,7 +9,7 @@ using System.Collections; using System.Collections.Generic; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.Resources { internal class ChangeTrackingDictionary : IDictionary, IReadOnlyDictionary where TKey : notnull { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/ChangeTrackingList.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/ChangeTrackingList.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/ChangeTrackingList.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/ChangeTrackingList.cs index eaa795128e3..78e4ab93d5c 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/ChangeTrackingList.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/ChangeTrackingList.cs @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.Resources { internal class ChangeTrackingList : IList, IReadOnlyList { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/ModelSerializationExtensions.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/ModelSerializationExtensions.cs similarity index 99% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/ModelSerializationExtensions.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/ModelSerializationExtensions.cs index 2cdf2a33036..88117d1ff4a 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/ModelSerializationExtensions.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/ModelSerializationExtensions.cs @@ -14,7 +14,7 @@ using System.Xml; using Azure.Core; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.Resources { internal static class ModelSerializationExtensions { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/Optional.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/Optional.cs similarity index 95% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/Optional.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/Optional.cs index 07cfed93426..5a7dc1277bb 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/Optional.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/Optional.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Text.Json; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.Resources { internal static class Optional { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/Utf8JsonRequestContent.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/Utf8JsonRequestContent.cs similarity index 95% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/Utf8JsonRequestContent.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/Utf8JsonRequestContent.cs index 2262e15ebf3..103263f990d 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/Internal/Utf8JsonRequestContent.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Internal/Utf8JsonRequestContent.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Azure.Core; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.Resources { internal class Utf8JsonRequestContent : RequestContent { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/NestedProxyResourceOperationSource.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/NestedProxyResourceOperationSource.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/NestedProxyResourceOperationSource.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/NestedProxyResourceOperationSource.cs index b4ab1dda355..9bfeb34586d 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/NestedProxyResourceOperationSource.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/NestedProxyResourceOperationSource.cs @@ -12,7 +12,7 @@ using Azure.Core; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { internal class NestedProxyResourceOperationSource : IOperationSource { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/ResourcesArmOperation.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/ResourcesArmOperation.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/ResourcesArmOperation.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/ResourcesArmOperation.cs index b2c60fd36e1..feca5be39a2 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/ResourcesArmOperation.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/ResourcesArmOperation.cs @@ -15,7 +15,7 @@ using Azure.Core.Pipeline; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { #pragma warning disable SA1649 // File name should match first type name internal class ResourcesArmOperation : ArmOperation diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs index b16cbb7fd39..a17b4b2242b 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs @@ -15,7 +15,7 @@ using Azure.Core.Pipeline; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { #pragma warning disable SA1649 // File name should match first type name internal class ResourcesArmOperation : ArmOperation diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/SingletonTrackedResourceOperationSource.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/SingletonTrackedResourceOperationSource.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/SingletonTrackedResourceOperationSource.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/SingletonTrackedResourceOperationSource.cs index 8e1131485ef..8d4bc96b4c5 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/SingletonTrackedResourceOperationSource.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/SingletonTrackedResourceOperationSource.cs @@ -12,7 +12,7 @@ using Azure.Core; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { internal class SingletonTrackedResourceOperationSource : IOperationSource { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/TopLevelTrackedResourceOperationSource.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/TopLevelTrackedResourceOperationSource.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/TopLevelTrackedResourceOperationSource.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/TopLevelTrackedResourceOperationSource.cs index d3b9c48b4da..e4cad22d102 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/LongRunningOperation/TopLevelTrackedResourceOperationSource.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/LongRunningOperation/TopLevelTrackedResourceOperationSource.cs @@ -12,7 +12,7 @@ using Azure.Core; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { internal class TopLevelTrackedResourceOperationSource : IOperationSource { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceListResult.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceListResult.Serialization.cs similarity index 99% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceListResult.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceListResult.Serialization.cs index c59fa7904d1..79cff2b72c8 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceListResult.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceListResult.Serialization.cs @@ -11,7 +11,7 @@ using System.Text.Json; using Azure.Core; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { internal partial class NestedProxyResourceListResult : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceListResult.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceListResult.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceListResult.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceListResult.cs index ba4201b3c7d..089a9ad11fb 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceListResult.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceListResult.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Linq; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { /// The response of a NestedProxyResource list operation. internal partial class NestedProxyResourceListResult diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceProperties.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceProperties.Serialization.cs similarity index 99% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceProperties.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceProperties.Serialization.cs index b6b7f12302d..9c17e61a227 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceProperties.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceProperties.Serialization.cs @@ -11,7 +11,7 @@ using System.Text.Json; using Azure.Core; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { public partial class NestedProxyResourceProperties : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceProperties.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceProperties.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceProperties.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceProperties.cs index 009674e5587..c80a2409910 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NestedProxyResourceProperties.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NestedProxyResourceProperties.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { /// Nested Proxy Resource Properties. public partial class NestedProxyResourceProperties diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NotificationDetails.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NotificationDetails.Serialization.cs similarity index 99% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NotificationDetails.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NotificationDetails.Serialization.cs index b0613ca9d41..58e9b58a61a 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NotificationDetails.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NotificationDetails.Serialization.cs @@ -11,7 +11,7 @@ using System.Text.Json; using Azure.Core; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { public partial class NotificationDetails : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NotificationDetails.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NotificationDetails.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NotificationDetails.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NotificationDetails.cs index a8a3319dbc5..16f71ba515a 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/NotificationDetails.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/NotificationDetails.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { /// The details of a user notification. public partial class NotificationDetails diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/ProvisioningState.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/ProvisioningState.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/ProvisioningState.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/ProvisioningState.cs index b8f68f7e80a..8a0c478c767 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/ProvisioningState.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/ProvisioningState.cs @@ -8,7 +8,7 @@ using System; using System.ComponentModel; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { /// The ProvisioningState. public readonly partial struct ProvisioningState : IEquatable diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceListResult.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceListResult.Serialization.cs similarity index 99% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceListResult.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceListResult.Serialization.cs index 1dd01e57c38..e6a698b2007 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceListResult.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceListResult.Serialization.cs @@ -11,7 +11,7 @@ using System.Text.Json; using Azure.Core; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { internal partial class SingletonTrackedResourceListResult : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceListResult.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceListResult.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceListResult.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceListResult.cs index a96766c32a9..5bd6b9026bd 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceListResult.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceListResult.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Linq; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { /// The response of a SingletonTrackedResource list operation. internal partial class SingletonTrackedResourceListResult diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceProperties.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceProperties.Serialization.cs similarity index 99% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceProperties.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceProperties.Serialization.cs index 57903c0d581..c50ab28cf93 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceProperties.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceProperties.Serialization.cs @@ -11,7 +11,7 @@ using System.Text.Json; using Azure.Core; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { public partial class SingletonTrackedResourceProperties : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceProperties.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceProperties.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceProperties.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceProperties.cs index 6cd02d4cc4d..2c1ce11c402 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/SingletonTrackedResourceProperties.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/SingletonTrackedResourceProperties.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { /// Singleton Arm Resource Properties. public partial class SingletonTrackedResourceProperties diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceListResult.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceListResult.Serialization.cs similarity index 99% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceListResult.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceListResult.Serialization.cs index 05f81e2e0c3..287ecf562f0 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceListResult.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceListResult.Serialization.cs @@ -11,7 +11,7 @@ using System.Text.Json; using Azure.Core; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { internal partial class TopLevelTrackedResourceListResult : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceListResult.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceListResult.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceListResult.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceListResult.cs index c4f27c7c66f..4c64cbee56a 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceListResult.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceListResult.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Linq; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { /// The response of a TopLevelTrackedResource list operation. internal partial class TopLevelTrackedResourceListResult diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceProperties.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceProperties.Serialization.cs similarity index 99% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceProperties.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceProperties.Serialization.cs index aac74281cf2..7a9cb3157fd 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceProperties.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceProperties.Serialization.cs @@ -11,7 +11,7 @@ using System.Text.Json; using Azure.Core; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { public partial class TopLevelTrackedResourceProperties : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceProperties.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceProperties.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceProperties.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceProperties.cs index d0c090fb683..3269c568e68 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/Models/TopLevelTrackedResourceProperties.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/TopLevelTrackedResourceProperties.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; -namespace _Azure.ResourceManager.Models.Resources.Models +namespace _Azure.ResourceManager.Resources.Models { /// Top Level Arm Resource Properties. public partial class TopLevelTrackedResourceProperties diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResource.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResource.Serialization.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResource.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResource.Serialization.cs index 7ec997aef27..f63ffb38a6d 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResource.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResource.Serialization.cs @@ -9,7 +9,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { public partial class NestedProxyResource : IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResource.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResource.cs similarity index 76% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResource.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResource.cs index bf657d7a0a3..1257d21f9a4 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResource.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResource.cs @@ -14,7 +14,7 @@ using Azure.Core.Pipeline; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { /// /// A Class representing a NestedProxyResource along with the instance operations that can be performed on it. @@ -31,16 +31,16 @@ public partial class NestedProxyResource : ArmResource /// The nextedProxyResourceName. public static ResourceIdentifier CreateResourceIdentifier(string subscriptionId, string resourceGroupName, string topLevelTrackedResourceName, string nextedProxyResourceName) { - var resourceId = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}"; + var resourceId = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}"; return new ResourceIdentifier(resourceId); } - private readonly ClientDiagnostics _nestedProxyResourceClientDiagnostics; - private readonly NestedProxyResourcesRestOperations _nestedProxyResourceRestClient; + private readonly ClientDiagnostics _nestedProxyResourceNestedClientDiagnostics; + private readonly NestedRestOperations _nestedProxyResourceNestedRestClient; private readonly NestedProxyResourceData _data; /// Gets the resource type for the operations. - public static readonly ResourceType ResourceType = "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/nestedProxyResources"; + public static readonly ResourceType ResourceType = "Azure.ResourceManager.Resources/topLevelTrackedResources/nestedProxyResources"; /// Initializes a new instance of the class for mocking. protected NestedProxyResource() @@ -61,9 +61,9 @@ internal NestedProxyResource(ArmClient client, NestedProxyResourceData data) : t /// The identifier of the resource that is the target of operations. internal NestedProxyResource(ArmClient client, ResourceIdentifier id) : base(client, id) { - _nestedProxyResourceClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Models.Resources", ResourceType.Namespace, Diagnostics); - TryGetApiVersion(ResourceType, out string nestedProxyResourceApiVersion); - _nestedProxyResourceRestClient = new NestedProxyResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, nestedProxyResourceApiVersion); + _nestedProxyResourceNestedClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Resources", ResourceType.Namespace, Diagnostics); + TryGetApiVersion(ResourceType, out string nestedProxyResourceNestedApiVersion); + _nestedProxyResourceNestedRestClient = new NestedRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, nestedProxyResourceNestedApiVersion); #if DEBUG ValidateResourceId(Id); #endif @@ -95,7 +95,7 @@ internal static void ValidateResourceId(ResourceIdentifier id) /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -114,11 +114,11 @@ internal static void ValidateResourceId(ResourceIdentifier id) /// The cancellation token to use. public virtual async Task> GetAsync(CancellationToken cancellationToken = default) { - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResource.Get"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResource.Get"); scope.Start(); try { - var response = await _nestedProxyResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false); + var response = await _nestedProxyResourceNestedRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new NestedProxyResource(Client, response.Value), response.GetRawResponse()); @@ -135,7 +135,7 @@ public virtual async Task> GetAsync(CancellationTo /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -154,11 +154,11 @@ public virtual async Task> GetAsync(CancellationTo /// The cancellation token to use. public virtual Response Get(CancellationToken cancellationToken = default) { - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResource.Get"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResource.Get"); scope.Start(); try { - var response = _nestedProxyResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken); + var response = _nestedProxyResourceNestedRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new NestedProxyResource(Client, response.Value), response.GetRawResponse()); @@ -175,7 +175,7 @@ public virtual Response Get(CancellationToken cancellationT /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -195,12 +195,12 @@ public virtual Response Get(CancellationToken cancellationT /// The cancellation token to use. public virtual async Task DeleteAsync(WaitUntil waitUntil, CancellationToken cancellationToken = default) { - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResource.Delete"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResource.Delete"); scope.Start(); try { - var response = await _nestedProxyResourceRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false); - var operation = new ResourcesArmOperation(_nestedProxyResourceClientDiagnostics, Pipeline, _nestedProxyResourceRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location); + var response = await _nestedProxyResourceNestedRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false); + var operation = new ResourcesArmOperation(_nestedProxyResourceNestedClientDiagnostics, Pipeline, _nestedProxyResourceNestedRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location); if (waitUntil == WaitUntil.Completed) await operation.WaitForCompletionResponseAsync(cancellationToken).ConfigureAwait(false); return operation; @@ -217,7 +217,7 @@ public virtual async Task DeleteAsync(WaitUntil waitUntil, Cancell /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -237,12 +237,12 @@ public virtual async Task DeleteAsync(WaitUntil waitUntil, Cancell /// The cancellation token to use. public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancellationToken = default) { - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResource.Delete"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResource.Delete"); scope.Start(); try { - var response = _nestedProxyResourceRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken); - var operation = new ResourcesArmOperation(_nestedProxyResourceClientDiagnostics, Pipeline, _nestedProxyResourceRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location); + var response = _nestedProxyResourceNestedRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken); + var operation = new ResourcesArmOperation(_nestedProxyResourceNestedClientDiagnostics, Pipeline, _nestedProxyResourceNestedRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location); if (waitUntil == WaitUntil.Completed) operation.WaitForCompletionResponse(cancellationToken); return operation; @@ -259,7 +259,7 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -283,12 +283,12 @@ public virtual async Task> UpdateAsync(WaitUnt { Argument.AssertNotNull(data, nameof(data)); - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResource.Update"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResource.Update"); scope.Start(); try { - var response = await _nestedProxyResourceRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, data, cancellationToken).ConfigureAwait(false); - var operation = new ResourcesArmOperation(new NestedProxyResourceOperationSource(Client), _nestedProxyResourceClientDiagnostics, Pipeline, _nestedProxyResourceRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, data).Request, response, OperationFinalStateVia.Location); + var response = await _nestedProxyResourceNestedRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, data, cancellationToken).ConfigureAwait(false); + var operation = new ResourcesArmOperation(new NestedProxyResourceOperationSource(Client), _nestedProxyResourceNestedClientDiagnostics, Pipeline, _nestedProxyResourceNestedRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, data).Request, response, OperationFinalStateVia.Location); if (waitUntil == WaitUntil.Completed) await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false); return operation; @@ -305,7 +305,7 @@ public virtual async Task> UpdateAsync(WaitUnt /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -329,12 +329,12 @@ public virtual ArmOperation Update(WaitUntil waitUntil, Nes { Argument.AssertNotNull(data, nameof(data)); - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResource.Update"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResource.Update"); scope.Start(); try { - var response = _nestedProxyResourceRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, data, cancellationToken); - var operation = new ResourcesArmOperation(new NestedProxyResourceOperationSource(Client), _nestedProxyResourceClientDiagnostics, Pipeline, _nestedProxyResourceRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, data).Request, response, OperationFinalStateVia.Location); + var response = _nestedProxyResourceNestedRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, data, cancellationToken); + var operation = new ResourcesArmOperation(new NestedProxyResourceOperationSource(Client), _nestedProxyResourceNestedClientDiagnostics, Pipeline, _nestedProxyResourceNestedRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, data).Request, response, OperationFinalStateVia.Location); if (waitUntil == WaitUntil.Completed) operation.WaitForCompletion(cancellationToken); return operation; diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResourceCollection.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResourceCollection.cs similarity index 77% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResourceCollection.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResourceCollection.cs index 4dd96069a6c..3d69a8171c1 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResourceCollection.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResourceCollection.cs @@ -17,7 +17,7 @@ using Azure.Core.Pipeline; using Azure.ResourceManager; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { /// /// A class representing a collection of and their operations. @@ -26,8 +26,8 @@ namespace _Azure.ResourceManager.Models.Resources /// public partial class NestedProxyResourceCollection : ArmCollection, IEnumerable, IAsyncEnumerable { - private readonly ClientDiagnostics _nestedProxyResourceClientDiagnostics; - private readonly NestedProxyResourcesRestOperations _nestedProxyResourceRestClient; + private readonly ClientDiagnostics _nestedProxyResourceNestedClientDiagnostics; + private readonly NestedRestOperations _nestedProxyResourceNestedRestClient; /// Initializes a new instance of the class for mocking. protected NestedProxyResourceCollection() @@ -39,9 +39,9 @@ protected NestedProxyResourceCollection() /// The identifier of the parent resource that is the target of operations. internal NestedProxyResourceCollection(ArmClient client, ResourceIdentifier id) : base(client, id) { - _nestedProxyResourceClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Models.Resources", NestedProxyResource.ResourceType.Namespace, Diagnostics); - TryGetApiVersion(NestedProxyResource.ResourceType, out string nestedProxyResourceApiVersion); - _nestedProxyResourceRestClient = new NestedProxyResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, nestedProxyResourceApiVersion); + _nestedProxyResourceNestedClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Resources", NestedProxyResource.ResourceType.Namespace, Diagnostics); + TryGetApiVersion(NestedProxyResource.ResourceType, out string nestedProxyResourceNestedApiVersion); + _nestedProxyResourceNestedRestClient = new NestedRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, nestedProxyResourceNestedApiVersion); #if DEBUG ValidateResourceId(Id); #endif @@ -58,7 +58,7 @@ internal static void ValidateResourceId(ResourceIdentifier id) /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -85,12 +85,12 @@ public virtual async Task> CreateOrUpdateAsync Argument.AssertNotNullOrEmpty(nextedProxyResourceName, nameof(nextedProxyResourceName)); Argument.AssertNotNull(data, nameof(data)); - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResourceCollection.CreateOrUpdate"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResourceCollection.CreateOrUpdate"); scope.Start(); try { - var response = await _nestedProxyResourceRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, data, cancellationToken).ConfigureAwait(false); - var operation = new ResourcesArmOperation(new NestedProxyResourceOperationSource(Client), _nestedProxyResourceClientDiagnostics, Pipeline, _nestedProxyResourceRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); + var response = await _nestedProxyResourceNestedRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, data, cancellationToken).ConfigureAwait(false); + var operation = new ResourcesArmOperation(new NestedProxyResourceOperationSource(Client), _nestedProxyResourceNestedClientDiagnostics, Pipeline, _nestedProxyResourceNestedRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); if (waitUntil == WaitUntil.Completed) await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false); return operation; @@ -107,7 +107,7 @@ public virtual async Task> CreateOrUpdateAsync /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -134,12 +134,12 @@ public virtual ArmOperation CreateOrUpdate(WaitUntil waitUn Argument.AssertNotNullOrEmpty(nextedProxyResourceName, nameof(nextedProxyResourceName)); Argument.AssertNotNull(data, nameof(data)); - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResourceCollection.CreateOrUpdate"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResourceCollection.CreateOrUpdate"); scope.Start(); try { - var response = _nestedProxyResourceRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, data, cancellationToken); - var operation = new ResourcesArmOperation(new NestedProxyResourceOperationSource(Client), _nestedProxyResourceClientDiagnostics, Pipeline, _nestedProxyResourceRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); + var response = _nestedProxyResourceNestedRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, data, cancellationToken); + var operation = new ResourcesArmOperation(new NestedProxyResourceOperationSource(Client), _nestedProxyResourceNestedClientDiagnostics, Pipeline, _nestedProxyResourceNestedRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); if (waitUntil == WaitUntil.Completed) operation.WaitForCompletion(cancellationToken); return operation; @@ -156,7 +156,7 @@ public virtual ArmOperation CreateOrUpdate(WaitUntil waitUn /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -180,11 +180,11 @@ public virtual async Task> GetAsync(string nextedP { Argument.AssertNotNullOrEmpty(nextedProxyResourceName, nameof(nextedProxyResourceName)); - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResourceCollection.Get"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResourceCollection.Get"); scope.Start(); try { - var response = await _nestedProxyResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken).ConfigureAwait(false); + var response = await _nestedProxyResourceNestedRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken).ConfigureAwait(false); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new NestedProxyResource(Client, response.Value), response.GetRawResponse()); @@ -201,7 +201,7 @@ public virtual async Task> GetAsync(string nextedP /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -225,11 +225,11 @@ public virtual Response Get(string nextedProxyResourceName, { Argument.AssertNotNullOrEmpty(nextedProxyResourceName, nameof(nextedProxyResourceName)); - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResourceCollection.Get"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResourceCollection.Get"); scope.Start(); try { - var response = _nestedProxyResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken); + var response = _nestedProxyResourceNestedRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new NestedProxyResource(Client, response.Value), response.GetRawResponse()); @@ -246,7 +246,7 @@ public virtual Response Get(string nextedProxyResourceName, /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources /// /// /// Operation Id @@ -266,9 +266,9 @@ public virtual Response Get(string nextedProxyResourceName, /// An async collection of that may take multiple service requests to iterate over. public virtual AsyncPageable GetAllAsync(CancellationToken cancellationToken = default) { - HttpMessage FirstPageRequest(int? pageSizeHint) => _nestedProxyResourceRestClient.CreateListByTopLevelTrackedResourceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _nestedProxyResourceRestClient.CreateListByTopLevelTrackedResourceNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new NestedProxyResource(Client, NestedProxyResourceData.DeserializeNestedProxyResourceData(e)), _nestedProxyResourceClientDiagnostics, Pipeline, "NestedProxyResourceCollection.GetAll", "value", "nextLink", cancellationToken); + HttpMessage FirstPageRequest(int? pageSizeHint) => _nestedProxyResourceNestedRestClient.CreateListByTopLevelTrackedResourceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _nestedProxyResourceNestedRestClient.CreateListByTopLevelTrackedResourceNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name); + return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new NestedProxyResource(Client, NestedProxyResourceData.DeserializeNestedProxyResourceData(e)), _nestedProxyResourceNestedClientDiagnostics, Pipeline, "NestedProxyResourceCollection.GetAll", "value", "nextLink", cancellationToken); } /// @@ -276,7 +276,7 @@ public virtual AsyncPageable GetAllAsync(CancellationToken /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources /// /// /// Operation Id @@ -296,9 +296,9 @@ public virtual AsyncPageable GetAllAsync(CancellationToken /// A collection of that may take multiple service requests to iterate over. public virtual Pageable GetAll(CancellationToken cancellationToken = default) { - HttpMessage FirstPageRequest(int? pageSizeHint) => _nestedProxyResourceRestClient.CreateListByTopLevelTrackedResourceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _nestedProxyResourceRestClient.CreateListByTopLevelTrackedResourceNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new NestedProxyResource(Client, NestedProxyResourceData.DeserializeNestedProxyResourceData(e)), _nestedProxyResourceClientDiagnostics, Pipeline, "NestedProxyResourceCollection.GetAll", "value", "nextLink", cancellationToken); + HttpMessage FirstPageRequest(int? pageSizeHint) => _nestedProxyResourceNestedRestClient.CreateListByTopLevelTrackedResourceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _nestedProxyResourceNestedRestClient.CreateListByTopLevelTrackedResourceNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name); + return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new NestedProxyResource(Client, NestedProxyResourceData.DeserializeNestedProxyResourceData(e)), _nestedProxyResourceNestedClientDiagnostics, Pipeline, "NestedProxyResourceCollection.GetAll", "value", "nextLink", cancellationToken); } /// @@ -306,7 +306,7 @@ public virtual Pageable GetAll(CancellationToken cancellati /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -330,11 +330,11 @@ public virtual async Task> ExistsAsync(string nextedProxyResource { Argument.AssertNotNullOrEmpty(nextedProxyResourceName, nameof(nextedProxyResourceName)); - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResourceCollection.Exists"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResourceCollection.Exists"); scope.Start(); try { - var response = await _nestedProxyResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); + var response = await _nestedProxyResourceNestedRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); return Response.FromValue(response.Value != null, response.GetRawResponse()); } catch (Exception e) @@ -349,7 +349,7 @@ public virtual async Task> ExistsAsync(string nextedProxyResource /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -373,11 +373,11 @@ public virtual Response Exists(string nextedProxyResourceName, Cancellatio { Argument.AssertNotNullOrEmpty(nextedProxyResourceName, nameof(nextedProxyResourceName)); - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResourceCollection.Exists"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResourceCollection.Exists"); scope.Start(); try { - var response = _nestedProxyResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken: cancellationToken); + var response = _nestedProxyResourceNestedRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken: cancellationToken); return Response.FromValue(response.Value != null, response.GetRawResponse()); } catch (Exception e) @@ -392,7 +392,7 @@ public virtual Response Exists(string nextedProxyResourceName, Cancellatio /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -416,11 +416,11 @@ public virtual async Task> GetIfExistsAsyn { Argument.AssertNotNullOrEmpty(nextedProxyResourceName, nameof(nextedProxyResourceName)); - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResourceCollection.GetIfExists"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResourceCollection.GetIfExists"); scope.Start(); try { - var response = await _nestedProxyResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); + var response = await _nestedProxyResourceNestedRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); if (response.Value == null) return new NoValueResponse(response.GetRawResponse()); return Response.FromValue(new NestedProxyResource(Client, response.Value), response.GetRawResponse()); @@ -437,7 +437,7 @@ public virtual async Task> GetIfExistsAsyn /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -461,11 +461,11 @@ public virtual NullableResponse GetIfExists(string nextedPr { Argument.AssertNotNullOrEmpty(nextedProxyResourceName, nameof(nextedProxyResourceName)); - using var scope = _nestedProxyResourceClientDiagnostics.CreateScope("NestedProxyResourceCollection.GetIfExists"); + using var scope = _nestedProxyResourceNestedClientDiagnostics.CreateScope("NestedProxyResourceCollection.GetIfExists"); scope.Start(); try { - var response = _nestedProxyResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken: cancellationToken); + var response = _nestedProxyResourceNestedRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, nextedProxyResourceName, cancellationToken: cancellationToken); if (response.Value == null) return new NoValueResponse(response.GetRawResponse()); return Response.FromValue(new NestedProxyResource(Client, response.Value), response.GetRawResponse()); diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResourceData.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResourceData.Serialization.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResourceData.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResourceData.Serialization.cs index 41b19047f60..e90bc693e94 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResourceData.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResourceData.Serialization.cs @@ -11,9 +11,9 @@ using System.Text.Json; using Azure.Core; using Azure.ResourceManager.Models; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { public partial class NestedProxyResourceData : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResourceData.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResourceData.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResourceData.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResourceData.cs index 21c6aafdd7e..4b80c510a83 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/NestedProxyResourceData.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/NestedProxyResourceData.cs @@ -9,9 +9,9 @@ using System.Collections.Generic; using Azure.Core; using Azure.ResourceManager.Models; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { /// /// A class representing the NestedProxyResource data model. diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ProviderConstants.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/ProviderConstants.cs similarity index 84% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ProviderConstants.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/ProviderConstants.cs index d483e5a4e35..38ac8fc342e 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/src/Generated/ProviderConstants.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/ProviderConstants.cs @@ -7,7 +7,7 @@ using Azure.Core.Pipeline; -namespace _Azure.ResourceManager.Models.CommonTypes.ManagedIdentity +namespace _Azure.ResourceManager.Resources { internal static class ProviderConstants { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/RestOperations/NestedProxyResourcesRestOperations.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/RestOperations/NestedRestOperations.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/RestOperations/NestedProxyResourcesRestOperations.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/RestOperations/NestedRestOperations.cs index c113205f6ed..96144cb1915 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/RestOperations/NestedProxyResourcesRestOperations.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/RestOperations/NestedRestOperations.cs @@ -12,24 +12,24 @@ using Azure; using Azure.Core; using Azure.Core.Pipeline; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { - internal partial class NestedProxyResourcesRestOperations + internal partial class NestedRestOperations { private readonly TelemetryDetails _userAgent; private readonly HttpPipeline _pipeline; private readonly Uri _endpoint; private readonly string _apiVersion; - /// Initializes a new instance of NestedProxyResourcesRestOperations. + /// Initializes a new instance of NestedRestOperations. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The application id to use for user agent. /// Service host. /// The API version to use for this operation. /// or is null. - public NestedProxyResourcesRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default) + public NestedRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default) { _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); _endpoint = endpoint ?? new Uri("https://management.azure.com"); @@ -45,7 +45,7 @@ internal RequestUriBuilder CreateGetRequestUri(string subscriptionId, string res uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/nestedProxyResources/", false); uri.AppendPath(nextedProxyResourceName, true); @@ -64,7 +64,7 @@ internal HttpMessage CreateGetRequest(string subscriptionId, string resourceGrou uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/nestedProxyResources/", false); uri.AppendPath(nextedProxyResourceName, true); @@ -149,7 +149,7 @@ internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/nestedProxyResources/", false); uri.AppendPath(nextedProxyResourceName, true); @@ -168,7 +168,7 @@ internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/nestedProxyResources/", false); uri.AppendPath(nextedProxyResourceName, true); @@ -249,7 +249,7 @@ internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/nestedProxyResources/", false); uri.AppendPath(nextedProxyResourceName, true); @@ -268,7 +268,7 @@ internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceG uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/nestedProxyResources/", false); uri.AppendPath(nextedProxyResourceName, true); @@ -349,7 +349,7 @@ internal RequestUriBuilder CreateDeleteRequestUri(string subscriptionId, string uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/nestedProxyResources/", false); uri.AppendPath(nextedProxyResourceName, true); @@ -368,7 +368,7 @@ internal HttpMessage CreateDeleteRequest(string subscriptionId, string resourceG uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/nestedProxyResources/", false); uri.AppendPath(nextedProxyResourceName, true); @@ -441,7 +441,7 @@ internal RequestUriBuilder CreateListByTopLevelTrackedResourceRequestUri(string uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/nestedProxyResources", false); uri.AppendQuery("api-version", _apiVersion, true); @@ -459,7 +459,7 @@ internal HttpMessage CreateListByTopLevelTrackedResourceRequest(string subscript uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/nestedProxyResources", false); uri.AppendQuery("api-version", _apiVersion, true); diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/RestOperations/SingletonTrackedResourcesRestOperations.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/RestOperations/SingletonRestOperations.cs similarity index 95% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/RestOperations/SingletonTrackedResourcesRestOperations.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/RestOperations/SingletonRestOperations.cs index de1b9bdf570..3ff05cd4ddb 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/RestOperations/SingletonTrackedResourcesRestOperations.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/RestOperations/SingletonRestOperations.cs @@ -12,24 +12,24 @@ using Azure; using Azure.Core; using Azure.Core.Pipeline; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { - internal partial class SingletonTrackedResourcesRestOperations + internal partial class SingletonRestOperations { private readonly TelemetryDetails _userAgent; private readonly HttpPipeline _pipeline; private readonly Uri _endpoint; private readonly string _apiVersion; - /// Initializes a new instance of SingletonTrackedResourcesRestOperations. + /// Initializes a new instance of SingletonRestOperations. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The application id to use for user agent. /// Service host. /// The API version to use for this operation. /// or is null. - public SingletonTrackedResourcesRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default) + public SingletonRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default) { _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); _endpoint = endpoint ?? new Uri("https://management.azure.com"); @@ -45,7 +45,7 @@ internal RequestUriBuilder CreateGetByResourceGroupRequestUri(string subscriptio uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default", false); uri.AppendQuery("api-version", _apiVersion, true); return uri; } @@ -61,7 +61,7 @@ internal HttpMessage CreateGetByResourceGroupRequest(string subscriptionId, stri uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default", false); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); @@ -135,7 +135,7 @@ internal RequestUriBuilder CreateCreateOrUpdateRequestUri(string subscriptionId, uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default", false); uri.AppendQuery("api-version", _apiVersion, true); return uri; } @@ -151,7 +151,7 @@ internal HttpMessage CreateCreateOrUpdateRequest(string subscriptionId, string r uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default", false); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); @@ -221,7 +221,7 @@ internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default", false); uri.AppendQuery("api-version", _apiVersion, true); return uri; } @@ -237,7 +237,7 @@ internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceG uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default", false); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); @@ -315,7 +315,7 @@ internal RequestUriBuilder CreateListByResourceGroupRequestUri(string subscripti uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/singletonTrackedResources", false); uri.AppendQuery("api-version", _apiVersion, true); return uri; } @@ -331,7 +331,7 @@ internal HttpMessage CreateListByResourceGroupRequest(string subscriptionId, str uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/singletonTrackedResources", false); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/RestOperations/TopLevelTrackedResourcesRestOperations.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/RestOperations/TopLevelRestOperations.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/RestOperations/TopLevelTrackedResourcesRestOperations.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/RestOperations/TopLevelRestOperations.cs index 793ab97f535..8696652de93 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/RestOperations/TopLevelTrackedResourcesRestOperations.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/RestOperations/TopLevelRestOperations.cs @@ -12,24 +12,24 @@ using Azure; using Azure.Core; using Azure.Core.Pipeline; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { - internal partial class TopLevelTrackedResourcesRestOperations + internal partial class TopLevelRestOperations { private readonly TelemetryDetails _userAgent; private readonly HttpPipeline _pipeline; private readonly Uri _endpoint; private readonly string _apiVersion; - /// Initializes a new instance of TopLevelTrackedResourcesRestOperations. + /// Initializes a new instance of TopLevelRestOperations. /// The HTTP pipeline for sending and receiving REST requests and responses. /// The application id to use for user agent. /// Service host. /// The API version to use for this operation. /// or is null. - public TopLevelTrackedResourcesRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default) + public TopLevelRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default) { _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); _endpoint = endpoint ?? new Uri("https://management.azure.com"); @@ -45,7 +45,7 @@ internal RequestUriBuilder CreateGetRequestUri(string subscriptionId, string res uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); return uri; @@ -62,7 +62,7 @@ internal HttpMessage CreateGetRequest(string subscriptionId, string resourceGrou uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; @@ -141,7 +141,7 @@ internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); return uri; @@ -158,7 +158,7 @@ internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; @@ -233,7 +233,7 @@ internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); return uri; @@ -250,7 +250,7 @@ internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceG uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; @@ -325,7 +325,7 @@ internal RequestUriBuilder CreateDeleteRequestUri(string subscriptionId, string uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); return uri; @@ -342,7 +342,7 @@ internal HttpMessage CreateDeleteRequest(string subscriptionId, string resourceG uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; @@ -409,7 +409,7 @@ internal RequestUriBuilder CreateListByResourceGroupRequestUri(string subscripti uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources", false); uri.AppendQuery("api-version", _apiVersion, true); return uri; } @@ -425,7 +425,7 @@ internal HttpMessage CreateListByResourceGroupRequest(string subscriptionId, str uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources", false); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); @@ -493,7 +493,7 @@ internal RequestUriBuilder CreateListBySubscriptionRequestUri(string subscriptio uri.Reset(_endpoint); uri.AppendPath("/subscriptions/", false); uri.AppendPath(subscriptionId, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources", false); uri.AppendQuery("api-version", _apiVersion, true); return uri; } @@ -507,7 +507,7 @@ internal HttpMessage CreateListBySubscriptionRequest(string subscriptionId) uri.Reset(_endpoint); uri.AppendPath("/subscriptions/", false); uri.AppendPath(subscriptionId, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources", false); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); @@ -573,7 +573,7 @@ internal RequestUriBuilder CreateActionSyncRequestUri(string subscriptionId, str uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/actionSync", false); uri.AppendQuery("api-version", _apiVersion, true); @@ -591,7 +591,7 @@ internal HttpMessage CreateActionSyncRequest(string subscriptionId, string resou uri.AppendPath(subscriptionId, true); uri.AppendPath("/resourceGroups/", false); uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/", false); + uri.AppendPath("/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/", false); uri.AppendPath(topLevelTrackedResourceName, true); uri.AppendPath("/actionSync", false); uri.AppendQuery("api-version", _apiVersion, true); diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResource.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResource.Serialization.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResource.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResource.Serialization.cs index 1b2d14f4ea9..85280117c75 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResource.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResource.Serialization.cs @@ -9,7 +9,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { public partial class SingletonTrackedResource : IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResource.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResource.cs similarity index 83% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResource.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResource.cs index f431891a110..623bf3e9eb3 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResource.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResource.cs @@ -16,7 +16,7 @@ using Azure.ResourceManager; using Azure.ResourceManager.Resources; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { /// /// A Class representing a SingletonTrackedResource along with the instance operations that can be performed on it. @@ -31,16 +31,16 @@ public partial class SingletonTrackedResource : ArmResource /// The resourceGroupName. public static ResourceIdentifier CreateResourceIdentifier(string subscriptionId, string resourceGroupName) { - var resourceId = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default"; + var resourceId = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default"; return new ResourceIdentifier(resourceId); } - private readonly ClientDiagnostics _singletonTrackedResourceClientDiagnostics; - private readonly SingletonTrackedResourcesRestOperations _singletonTrackedResourceRestClient; + private readonly ClientDiagnostics _singletonTrackedResourceSingletonClientDiagnostics; + private readonly SingletonRestOperations _singletonTrackedResourceSingletonRestClient; private readonly SingletonTrackedResourceData _data; /// Gets the resource type for the operations. - public static readonly ResourceType ResourceType = "Azure.ResourceManager.Models.Resources/singletonTrackedResources"; + public static readonly ResourceType ResourceType = "Azure.ResourceManager.Resources/singletonTrackedResources"; /// Initializes a new instance of the class for mocking. protected SingletonTrackedResource() @@ -61,9 +61,9 @@ internal SingletonTrackedResource(ArmClient client, SingletonTrackedResourceData /// The identifier of the resource that is the target of operations. internal SingletonTrackedResource(ArmClient client, ResourceIdentifier id) : base(client, id) { - _singletonTrackedResourceClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Models.Resources", ResourceType.Namespace, Diagnostics); - TryGetApiVersion(ResourceType, out string singletonTrackedResourceApiVersion); - _singletonTrackedResourceRestClient = new SingletonTrackedResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, singletonTrackedResourceApiVersion); + _singletonTrackedResourceSingletonClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Resources", ResourceType.Namespace, Diagnostics); + TryGetApiVersion(ResourceType, out string singletonTrackedResourceSingletonApiVersion); + _singletonTrackedResourceSingletonRestClient = new SingletonRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, singletonTrackedResourceSingletonApiVersion); #if DEBUG ValidateResourceId(Id); #endif @@ -95,7 +95,7 @@ internal static void ValidateResourceId(ResourceIdentifier id) /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -114,11 +114,11 @@ internal static void ValidateResourceId(ResourceIdentifier id) /// The cancellation token to use. public virtual async Task> GetAsync(CancellationToken cancellationToken = default) { - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.Get"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.Get"); scope.Start(); try { - var response = await _singletonTrackedResourceRestClient.GetByResourceGroupAsync(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken).ConfigureAwait(false); + var response = await _singletonTrackedResourceSingletonRestClient.GetByResourceGroupAsync(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken).ConfigureAwait(false); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new SingletonTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -135,7 +135,7 @@ public virtual async Task> GetAsync(Cancellat /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -154,11 +154,11 @@ public virtual async Task> GetAsync(Cancellat /// The cancellation token to use. public virtual Response Get(CancellationToken cancellationToken = default) { - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.Get"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.Get"); scope.Start(); try { - var response = _singletonTrackedResourceRestClient.GetByResourceGroup(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken); + var response = _singletonTrackedResourceSingletonRestClient.GetByResourceGroup(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new SingletonTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -175,7 +175,7 @@ public virtual Response Get(CancellationToken cancella /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -198,11 +198,11 @@ public virtual async Task> UpdateAsync(Single { Argument.AssertNotNull(data, nameof(data)); - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.Update"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.Update"); scope.Start(); try { - var response = await _singletonTrackedResourceRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, data, cancellationToken).ConfigureAwait(false); + var response = await _singletonTrackedResourceSingletonRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, data, cancellationToken).ConfigureAwait(false); return Response.FromValue(new SingletonTrackedResource(Client, response.Value), response.GetRawResponse()); } catch (Exception e) @@ -217,7 +217,7 @@ public virtual async Task> UpdateAsync(Single /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -240,11 +240,11 @@ public virtual Response Update(SingletonTrackedResourc { Argument.AssertNotNull(data, nameof(data)); - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.Update"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.Update"); scope.Start(); try { - var response = _singletonTrackedResourceRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, data, cancellationToken); + var response = _singletonTrackedResourceSingletonRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, data, cancellationToken); return Response.FromValue(new SingletonTrackedResource(Client, response.Value), response.GetRawResponse()); } catch (Exception e) @@ -259,7 +259,7 @@ public virtual Response Update(SingletonTrackedResourc /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -283,12 +283,12 @@ public virtual async Task> CreateOrUpdate { Argument.AssertNotNull(data, nameof(data)); - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.CreateOrUpdate"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.CreateOrUpdate"); scope.Start(); try { - var response = await _singletonTrackedResourceRestClient.CreateOrUpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, data, cancellationToken).ConfigureAwait(false); - var operation = new ResourcesArmOperation(new SingletonTrackedResourceOperationSource(Client), _singletonTrackedResourceClientDiagnostics, Pipeline, _singletonTrackedResourceRestClient.CreateCreateOrUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); + var response = await _singletonTrackedResourceSingletonRestClient.CreateOrUpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, data, cancellationToken).ConfigureAwait(false); + var operation = new ResourcesArmOperation(new SingletonTrackedResourceOperationSource(Client), _singletonTrackedResourceSingletonClientDiagnostics, Pipeline, _singletonTrackedResourceSingletonRestClient.CreateCreateOrUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); if (waitUntil == WaitUntil.Completed) await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false); return operation; @@ -305,7 +305,7 @@ public virtual async Task> CreateOrUpdate /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -329,12 +329,12 @@ public virtual ArmOperation CreateOrUpdate(WaitUntil w { Argument.AssertNotNull(data, nameof(data)); - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.CreateOrUpdate"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.CreateOrUpdate"); scope.Start(); try { - var response = _singletonTrackedResourceRestClient.CreateOrUpdate(Id.SubscriptionId, Id.ResourceGroupName, data, cancellationToken); - var operation = new ResourcesArmOperation(new SingletonTrackedResourceOperationSource(Client), _singletonTrackedResourceClientDiagnostics, Pipeline, _singletonTrackedResourceRestClient.CreateCreateOrUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); + var response = _singletonTrackedResourceSingletonRestClient.CreateOrUpdate(Id.SubscriptionId, Id.ResourceGroupName, data, cancellationToken); + var operation = new ResourcesArmOperation(new SingletonTrackedResourceOperationSource(Client), _singletonTrackedResourceSingletonClientDiagnostics, Pipeline, _singletonTrackedResourceSingletonRestClient.CreateCreateOrUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); if (waitUntil == WaitUntil.Completed) operation.WaitForCompletion(cancellationToken); return operation; @@ -351,7 +351,7 @@ public virtual ArmOperation CreateOrUpdate(WaitUntil w /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -376,7 +376,7 @@ public virtual async Task> AddTagAsync(string Argument.AssertNotNull(key, nameof(key)); Argument.AssertNotNull(value, nameof(value)); - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.AddTag"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.AddTag"); scope.Start(); try { @@ -385,7 +385,7 @@ public virtual async Task> AddTagAsync(string var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false); originalTags.Value.Data.TagValues[key] = value; await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false); - var originalResponse = await _singletonTrackedResourceRestClient.GetByResourceGroupAsync(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken).ConfigureAwait(false); + var originalResponse = await _singletonTrackedResourceSingletonRestClient.GetByResourceGroupAsync(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken).ConfigureAwait(false); return Response.FromValue(new SingletonTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -413,7 +413,7 @@ public virtual async Task> AddTagAsync(string /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -438,7 +438,7 @@ public virtual Response AddTag(string key, string valu Argument.AssertNotNull(key, nameof(key)); Argument.AssertNotNull(value, nameof(value)); - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.AddTag"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.AddTag"); scope.Start(); try { @@ -447,7 +447,7 @@ public virtual Response AddTag(string key, string valu var originalTags = GetTagResource().Get(cancellationToken); originalTags.Value.Data.TagValues[key] = value; GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken); - var originalResponse = _singletonTrackedResourceRestClient.GetByResourceGroup(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken); + var originalResponse = _singletonTrackedResourceSingletonRestClient.GetByResourceGroup(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken); return Response.FromValue(new SingletonTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -475,7 +475,7 @@ public virtual Response AddTag(string key, string valu /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -498,7 +498,7 @@ public virtual async Task> SetTagsAsync(IDict { Argument.AssertNotNull(tags, nameof(tags)); - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.SetTags"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.SetTags"); scope.Start(); try { @@ -508,7 +508,7 @@ public virtual async Task> SetTagsAsync(IDict var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false); originalTags.Value.Data.TagValues.ReplaceWith(tags); await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false); - var originalResponse = await _singletonTrackedResourceRestClient.GetByResourceGroupAsync(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken).ConfigureAwait(false); + var originalResponse = await _singletonTrackedResourceSingletonRestClient.GetByResourceGroupAsync(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken).ConfigureAwait(false); return Response.FromValue(new SingletonTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -532,7 +532,7 @@ public virtual async Task> SetTagsAsync(IDict /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -555,7 +555,7 @@ public virtual Response SetTags(IDictionary SetTags(IDictionary SetTags(IDictionary /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -612,7 +612,7 @@ public virtual async Task> RemoveTagAsync(str { Argument.AssertNotNull(key, nameof(key)); - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.RemoveTag"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.RemoveTag"); scope.Start(); try { @@ -621,7 +621,7 @@ public virtual async Task> RemoveTagAsync(str var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false); originalTags.Value.Data.TagValues.Remove(key); await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false); - var originalResponse = await _singletonTrackedResourceRestClient.GetByResourceGroupAsync(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken).ConfigureAwait(false); + var originalResponse = await _singletonTrackedResourceSingletonRestClient.GetByResourceGroupAsync(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken).ConfigureAwait(false); return Response.FromValue(new SingletonTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -649,7 +649,7 @@ public virtual async Task> RemoveTagAsync(str /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default /// /// /// Operation Id @@ -672,7 +672,7 @@ public virtual Response RemoveTag(string key, Cancella { Argument.AssertNotNull(key, nameof(key)); - using var scope = _singletonTrackedResourceClientDiagnostics.CreateScope("SingletonTrackedResource.RemoveTag"); + using var scope = _singletonTrackedResourceSingletonClientDiagnostics.CreateScope("SingletonTrackedResource.RemoveTag"); scope.Start(); try { @@ -681,7 +681,7 @@ public virtual Response RemoveTag(string key, Cancella var originalTags = GetTagResource().Get(cancellationToken); originalTags.Value.Data.TagValues.Remove(key); GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken); - var originalResponse = _singletonTrackedResourceRestClient.GetByResourceGroup(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken); + var originalResponse = _singletonTrackedResourceSingletonRestClient.GetByResourceGroup(Id.SubscriptionId, Id.ResourceGroupName, cancellationToken); return Response.FromValue(new SingletonTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResourceData.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResourceData.Serialization.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResourceData.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResourceData.Serialization.cs index 54832584e3c..f9fedf2131d 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResourceData.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResourceData.Serialization.cs @@ -11,9 +11,9 @@ using System.Text.Json; using Azure.Core; using Azure.ResourceManager.Models; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { public partial class SingletonTrackedResourceData : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResourceData.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResourceData.cs similarity index 97% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResourceData.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResourceData.cs index 1058ef01480..92b353582dc 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/SingletonTrackedResourceData.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/SingletonTrackedResourceData.cs @@ -9,9 +9,9 @@ using System.Collections.Generic; using Azure.Core; using Azure.ResourceManager.Models; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { /// /// A class representing the SingletonTrackedResource data model. diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResource.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResource.Serialization.cs similarity index 96% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResource.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResource.Serialization.cs index e25fecd2bf6..caac1c968c0 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResource.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResource.Serialization.cs @@ -9,7 +9,7 @@ using System.ClientModel.Primitives; using System.Text.Json; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { public partial class TopLevelTrackedResource : IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResource.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResource.cs similarity index 82% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResource.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResource.cs index ba8f012bbde..cbdeac7f6ea 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResource.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResource.cs @@ -15,9 +15,9 @@ using Azure.Core.Pipeline; using Azure.ResourceManager; using Azure.ResourceManager.Resources; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { /// /// A Class representing a TopLevelTrackedResource along with the instance operations that can be performed on it. @@ -33,16 +33,16 @@ public partial class TopLevelTrackedResource : ArmResource /// The topLevelTrackedResourceName. public static ResourceIdentifier CreateResourceIdentifier(string subscriptionId, string resourceGroupName, string topLevelTrackedResourceName) { - var resourceId = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}"; + var resourceId = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}"; return new ResourceIdentifier(resourceId); } - private readonly ClientDiagnostics _topLevelTrackedResourceClientDiagnostics; - private readonly TopLevelTrackedResourcesRestOperations _topLevelTrackedResourceRestClient; + private readonly ClientDiagnostics _topLevelTrackedResourceTopLevelClientDiagnostics; + private readonly TopLevelRestOperations _topLevelTrackedResourceTopLevelRestClient; private readonly TopLevelTrackedResourceData _data; /// Gets the resource type for the operations. - public static readonly ResourceType ResourceType = "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"; + public static readonly ResourceType ResourceType = "Azure.ResourceManager.Resources/topLevelTrackedResources"; /// Initializes a new instance of the class for mocking. protected TopLevelTrackedResource() @@ -63,9 +63,9 @@ internal TopLevelTrackedResource(ArmClient client, TopLevelTrackedResourceData d /// The identifier of the resource that is the target of operations. internal TopLevelTrackedResource(ArmClient client, ResourceIdentifier id) : base(client, id) { - _topLevelTrackedResourceClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Models.Resources", ResourceType.Namespace, Diagnostics); - TryGetApiVersion(ResourceType, out string topLevelTrackedResourceApiVersion); - _topLevelTrackedResourceRestClient = new TopLevelTrackedResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, topLevelTrackedResourceApiVersion); + _topLevelTrackedResourceTopLevelClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Resources", ResourceType.Namespace, Diagnostics); + TryGetApiVersion(ResourceType, out string topLevelTrackedResourceTopLevelApiVersion); + _topLevelTrackedResourceTopLevelRestClient = new TopLevelRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, topLevelTrackedResourceTopLevelApiVersion); #if DEBUG ValidateResourceId(Id); #endif @@ -104,7 +104,7 @@ public virtual NestedProxyResourceCollection GetNestedProxyResources() /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -135,7 +135,7 @@ public virtual async Task> GetNestedProxyResourceA /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName} /// /// /// Operation Id @@ -166,7 +166,7 @@ public virtual Response GetNestedProxyResource(string nexte /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -185,11 +185,11 @@ public virtual Response GetNestedProxyResource(string nexte /// The cancellation token to use. public virtual async Task> GetAsync(CancellationToken cancellationToken = default) { - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.Get"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.Get"); scope.Start(); try { - var response = await _topLevelTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); + var response = await _topLevelTrackedResourceTopLevelRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new TopLevelTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -206,7 +206,7 @@ public virtual async Task> GetAsync(Cancellati /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -225,11 +225,11 @@ public virtual async Task> GetAsync(Cancellati /// The cancellation token to use. public virtual Response Get(CancellationToken cancellationToken = default) { - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.Get"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.Get"); scope.Start(); try { - var response = _topLevelTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); + var response = _topLevelTrackedResourceTopLevelRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new TopLevelTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -246,7 +246,7 @@ public virtual Response Get(CancellationToken cancellat /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -266,12 +266,12 @@ public virtual Response Get(CancellationToken cancellat /// The cancellation token to use. public virtual async Task DeleteAsync(WaitUntil waitUntil, CancellationToken cancellationToken = default) { - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.Delete"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.Delete"); scope.Start(); try { - var response = await _topLevelTrackedResourceRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); - var operation = new ResourcesArmOperation(_topLevelTrackedResourceClientDiagnostics, Pipeline, _topLevelTrackedResourceRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.Location); + var response = await _topLevelTrackedResourceTopLevelRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); + var operation = new ResourcesArmOperation(_topLevelTrackedResourceTopLevelClientDiagnostics, Pipeline, _topLevelTrackedResourceTopLevelRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.Location); if (waitUntil == WaitUntil.Completed) await operation.WaitForCompletionResponseAsync(cancellationToken).ConfigureAwait(false); return operation; @@ -288,7 +288,7 @@ public virtual async Task DeleteAsync(WaitUntil waitUntil, Cancell /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -308,12 +308,12 @@ public virtual async Task DeleteAsync(WaitUntil waitUntil, Cancell /// The cancellation token to use. public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancellationToken = default) { - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.Delete"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.Delete"); scope.Start(); try { - var response = _topLevelTrackedResourceRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); - var operation = new ResourcesArmOperation(_topLevelTrackedResourceClientDiagnostics, Pipeline, _topLevelTrackedResourceRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.Location); + var response = _topLevelTrackedResourceTopLevelRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); + var operation = new ResourcesArmOperation(_topLevelTrackedResourceTopLevelClientDiagnostics, Pipeline, _topLevelTrackedResourceTopLevelRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.Location); if (waitUntil == WaitUntil.Completed) operation.WaitForCompletionResponse(cancellationToken); return operation; @@ -330,7 +330,7 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -354,12 +354,12 @@ public virtual async Task> UpdateAsync(Wai { Argument.AssertNotNull(data, nameof(data)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.Update"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.Update"); scope.Start(); try { - var response = await _topLevelTrackedResourceRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data, cancellationToken).ConfigureAwait(false); - var operation = new ResourcesArmOperation(new TopLevelTrackedResourceOperationSource(Client), _topLevelTrackedResourceClientDiagnostics, Pipeline, _topLevelTrackedResourceRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data).Request, response, OperationFinalStateVia.Location); + var response = await _topLevelTrackedResourceTopLevelRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data, cancellationToken).ConfigureAwait(false); + var operation = new ResourcesArmOperation(new TopLevelTrackedResourceOperationSource(Client), _topLevelTrackedResourceTopLevelClientDiagnostics, Pipeline, _topLevelTrackedResourceTopLevelRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data).Request, response, OperationFinalStateVia.Location); if (waitUntil == WaitUntil.Completed) await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false); return operation; @@ -376,7 +376,7 @@ public virtual async Task> UpdateAsync(Wai /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -400,12 +400,12 @@ public virtual ArmOperation Update(WaitUntil waitUntil, { Argument.AssertNotNull(data, nameof(data)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.Update"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.Update"); scope.Start(); try { - var response = _topLevelTrackedResourceRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data, cancellationToken); - var operation = new ResourcesArmOperation(new TopLevelTrackedResourceOperationSource(Client), _topLevelTrackedResourceClientDiagnostics, Pipeline, _topLevelTrackedResourceRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data).Request, response, OperationFinalStateVia.Location); + var response = _topLevelTrackedResourceTopLevelRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data, cancellationToken); + var operation = new ResourcesArmOperation(new TopLevelTrackedResourceOperationSource(Client), _topLevelTrackedResourceTopLevelClientDiagnostics, Pipeline, _topLevelTrackedResourceTopLevelRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, data).Request, response, OperationFinalStateVia.Location); if (waitUntil == WaitUntil.Completed) operation.WaitForCompletion(cancellationToken); return operation; @@ -422,11 +422,11 @@ public virtual ArmOperation Update(WaitUntil waitUntil, /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/actionSync + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/actionSync /// /// /// Operation Id - /// TopLevelTrackedResources_ActionSync + /// TopLevel_ActionSync /// /// /// Default Api Version @@ -445,11 +445,11 @@ public virtual async Task ActionSyncAsync(NotificationDetails details, { Argument.AssertNotNull(details, nameof(details)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.ActionSync"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.ActionSync"); scope.Start(); try { - var response = await _topLevelTrackedResourceRestClient.ActionSyncAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, details, cancellationToken).ConfigureAwait(false); + var response = await _topLevelTrackedResourceTopLevelRestClient.ActionSyncAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, details, cancellationToken).ConfigureAwait(false); return response; } catch (Exception e) @@ -464,11 +464,11 @@ public virtual async Task ActionSyncAsync(NotificationDetails details, /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/actionSync + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/actionSync /// /// /// Operation Id - /// TopLevelTrackedResources_ActionSync + /// TopLevel_ActionSync /// /// /// Default Api Version @@ -487,11 +487,11 @@ public virtual Response ActionSync(NotificationDetails details, CancellationToke { Argument.AssertNotNull(details, nameof(details)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.ActionSync"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.ActionSync"); scope.Start(); try { - var response = _topLevelTrackedResourceRestClient.ActionSync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, details, cancellationToken); + var response = _topLevelTrackedResourceTopLevelRestClient.ActionSync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, details, cancellationToken); return response; } catch (Exception e) @@ -506,7 +506,7 @@ public virtual Response ActionSync(NotificationDetails details, CancellationToke /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -531,7 +531,7 @@ public virtual async Task> AddTagAsync(string Argument.AssertNotNull(key, nameof(key)); Argument.AssertNotNull(value, nameof(value)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.AddTag"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.AddTag"); scope.Start(); try { @@ -540,7 +540,7 @@ public virtual async Task> AddTagAsync(string var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false); originalTags.Value.Data.TagValues[key] = value; await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false); - var originalResponse = await _topLevelTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); + var originalResponse = await _topLevelTrackedResourceTopLevelRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); return Response.FromValue(new TopLevelTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -568,7 +568,7 @@ public virtual async Task> AddTagAsync(string /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -593,7 +593,7 @@ public virtual Response AddTag(string key, string value Argument.AssertNotNull(key, nameof(key)); Argument.AssertNotNull(value, nameof(value)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.AddTag"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.AddTag"); scope.Start(); try { @@ -602,7 +602,7 @@ public virtual Response AddTag(string key, string value var originalTags = GetTagResource().Get(cancellationToken); originalTags.Value.Data.TagValues[key] = value; GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken); - var originalResponse = _topLevelTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); + var originalResponse = _topLevelTrackedResourceTopLevelRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); return Response.FromValue(new TopLevelTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -630,7 +630,7 @@ public virtual Response AddTag(string key, string value /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -653,7 +653,7 @@ public virtual async Task> SetTagsAsync(IDicti { Argument.AssertNotNull(tags, nameof(tags)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.SetTags"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.SetTags"); scope.Start(); try { @@ -663,7 +663,7 @@ public virtual async Task> SetTagsAsync(IDicti var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false); originalTags.Value.Data.TagValues.ReplaceWith(tags); await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false); - var originalResponse = await _topLevelTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); + var originalResponse = await _topLevelTrackedResourceTopLevelRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); return Response.FromValue(new TopLevelTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -687,7 +687,7 @@ public virtual async Task> SetTagsAsync(IDicti /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -710,7 +710,7 @@ public virtual Response SetTags(IDictionary SetTags(IDictionary SetTags(IDictionary /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -767,7 +767,7 @@ public virtual async Task> RemoveTagAsync(stri { Argument.AssertNotNull(key, nameof(key)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.RemoveTag"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.RemoveTag"); scope.Start(); try { @@ -776,7 +776,7 @@ public virtual async Task> RemoveTagAsync(stri var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false); originalTags.Value.Data.TagValues.Remove(key); await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false); - var originalResponse = await _topLevelTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); + var originalResponse = await _topLevelTrackedResourceTopLevelRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); return Response.FromValue(new TopLevelTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else @@ -804,7 +804,7 @@ public virtual async Task> RemoveTagAsync(stri /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -827,7 +827,7 @@ public virtual Response RemoveTag(string key, Cancellat { Argument.AssertNotNull(key, nameof(key)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResource.RemoveTag"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResource.RemoveTag"); scope.Start(); try { @@ -836,7 +836,7 @@ public virtual Response RemoveTag(string key, Cancellat var originalTags = GetTagResource().Get(cancellationToken); originalTags.Value.Data.TagValues.Remove(key); GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken); - var originalResponse = _topLevelTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); + var originalResponse = _topLevelTrackedResourceTopLevelRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); return Response.FromValue(new TopLevelTrackedResource(Client, originalResponse.Value), originalResponse.GetRawResponse()); } else diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResourceCollection.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResourceCollection.cs similarity index 78% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResourceCollection.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResourceCollection.cs index 1eeea52fac5..c620da532d7 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResourceCollection.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResourceCollection.cs @@ -18,7 +18,7 @@ using Azure.ResourceManager; using Azure.ResourceManager.Resources; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { /// /// A class representing a collection of and their operations. @@ -27,8 +27,8 @@ namespace _Azure.ResourceManager.Models.Resources /// public partial class TopLevelTrackedResourceCollection : ArmCollection, IEnumerable, IAsyncEnumerable { - private readonly ClientDiagnostics _topLevelTrackedResourceClientDiagnostics; - private readonly TopLevelTrackedResourcesRestOperations _topLevelTrackedResourceRestClient; + private readonly ClientDiagnostics _topLevelTrackedResourceTopLevelClientDiagnostics; + private readonly TopLevelRestOperations _topLevelTrackedResourceTopLevelRestClient; /// Initializes a new instance of the class for mocking. protected TopLevelTrackedResourceCollection() @@ -40,9 +40,9 @@ protected TopLevelTrackedResourceCollection() /// The identifier of the parent resource that is the target of operations. internal TopLevelTrackedResourceCollection(ArmClient client, ResourceIdentifier id) : base(client, id) { - _topLevelTrackedResourceClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Models.Resources", TopLevelTrackedResource.ResourceType.Namespace, Diagnostics); - TryGetApiVersion(TopLevelTrackedResource.ResourceType, out string topLevelTrackedResourceApiVersion); - _topLevelTrackedResourceRestClient = new TopLevelTrackedResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, topLevelTrackedResourceApiVersion); + _topLevelTrackedResourceTopLevelClientDiagnostics = new ClientDiagnostics("_Azure.ResourceManager.Resources", TopLevelTrackedResource.ResourceType.Namespace, Diagnostics); + TryGetApiVersion(TopLevelTrackedResource.ResourceType, out string topLevelTrackedResourceTopLevelApiVersion); + _topLevelTrackedResourceTopLevelRestClient = new TopLevelRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, topLevelTrackedResourceTopLevelApiVersion); #if DEBUG ValidateResourceId(Id); #endif @@ -59,7 +59,7 @@ internal static void ValidateResourceId(ResourceIdentifier id) /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -86,12 +86,12 @@ public virtual async Task> CreateOrUpdateA Argument.AssertNotNullOrEmpty(topLevelTrackedResourceName, nameof(topLevelTrackedResourceName)); Argument.AssertNotNull(data, nameof(data)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.CreateOrUpdate"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.CreateOrUpdate"); scope.Start(); try { - var response = await _topLevelTrackedResourceRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, data, cancellationToken).ConfigureAwait(false); - var operation = new ResourcesArmOperation(new TopLevelTrackedResourceOperationSource(Client), _topLevelTrackedResourceClientDiagnostics, Pipeline, _topLevelTrackedResourceRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); + var response = await _topLevelTrackedResourceTopLevelRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, data, cancellationToken).ConfigureAwait(false); + var operation = new ResourcesArmOperation(new TopLevelTrackedResourceOperationSource(Client), _topLevelTrackedResourceTopLevelClientDiagnostics, Pipeline, _topLevelTrackedResourceTopLevelRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); if (waitUntil == WaitUntil.Completed) await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false); return operation; @@ -108,7 +108,7 @@ public virtual async Task> CreateOrUpdateA /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -135,12 +135,12 @@ public virtual ArmOperation CreateOrUpdate(WaitUntil wa Argument.AssertNotNullOrEmpty(topLevelTrackedResourceName, nameof(topLevelTrackedResourceName)); Argument.AssertNotNull(data, nameof(data)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.CreateOrUpdate"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.CreateOrUpdate"); scope.Start(); try { - var response = _topLevelTrackedResourceRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, data, cancellationToken); - var operation = new ResourcesArmOperation(new TopLevelTrackedResourceOperationSource(Client), _topLevelTrackedResourceClientDiagnostics, Pipeline, _topLevelTrackedResourceRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); + var response = _topLevelTrackedResourceTopLevelRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, data, cancellationToken); + var operation = new ResourcesArmOperation(new TopLevelTrackedResourceOperationSource(Client), _topLevelTrackedResourceTopLevelClientDiagnostics, Pipeline, _topLevelTrackedResourceTopLevelRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation); if (waitUntil == WaitUntil.Completed) operation.WaitForCompletion(cancellationToken); return operation; @@ -157,7 +157,7 @@ public virtual ArmOperation CreateOrUpdate(WaitUntil wa /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -181,11 +181,11 @@ public virtual async Task> GetAsync(string top { Argument.AssertNotNullOrEmpty(topLevelTrackedResourceName, nameof(topLevelTrackedResourceName)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.Get"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.Get"); scope.Start(); try { - var response = await _topLevelTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken).ConfigureAwait(false); + var response = await _topLevelTrackedResourceTopLevelRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken).ConfigureAwait(false); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new TopLevelTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -202,7 +202,7 @@ public virtual async Task> GetAsync(string top /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -226,11 +226,11 @@ public virtual Response Get(string topLevelTrackedResou { Argument.AssertNotNullOrEmpty(topLevelTrackedResourceName, nameof(topLevelTrackedResourceName)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.Get"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.Get"); scope.Start(); try { - var response = _topLevelTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken); + var response = _topLevelTrackedResourceTopLevelRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken); if (response.Value == null) throw new RequestFailedException(response.GetRawResponse()); return Response.FromValue(new TopLevelTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -247,7 +247,7 @@ public virtual Response Get(string topLevelTrackedResou /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources /// /// /// Operation Id @@ -267,9 +267,9 @@ public virtual Response Get(string topLevelTrackedResou /// An async collection of that may take multiple service requests to iterate over. public virtual AsyncPageable GetAllAsync(CancellationToken cancellationToken = default) { - HttpMessage FirstPageRequest(int? pageSizeHint) => _topLevelTrackedResourceRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _topLevelTrackedResourceRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new TopLevelTrackedResource(Client, TopLevelTrackedResourceData.DeserializeTopLevelTrackedResourceData(e)), _topLevelTrackedResourceClientDiagnostics, Pipeline, "TopLevelTrackedResourceCollection.GetAll", "value", "nextLink", cancellationToken); + HttpMessage FirstPageRequest(int? pageSizeHint) => _topLevelTrackedResourceTopLevelRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _topLevelTrackedResourceTopLevelRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName); + return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new TopLevelTrackedResource(Client, TopLevelTrackedResourceData.DeserializeTopLevelTrackedResourceData(e)), _topLevelTrackedResourceTopLevelClientDiagnostics, Pipeline, "TopLevelTrackedResourceCollection.GetAll", "value", "nextLink", cancellationToken); } /// @@ -277,7 +277,7 @@ public virtual AsyncPageable GetAllAsync(CancellationTo /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources /// /// /// Operation Id @@ -297,9 +297,9 @@ public virtual AsyncPageable GetAllAsync(CancellationTo /// A collection of that may take multiple service requests to iterate over. public virtual Pageable GetAll(CancellationToken cancellationToken = default) { - HttpMessage FirstPageRequest(int? pageSizeHint) => _topLevelTrackedResourceRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _topLevelTrackedResourceRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new TopLevelTrackedResource(Client, TopLevelTrackedResourceData.DeserializeTopLevelTrackedResourceData(e)), _topLevelTrackedResourceClientDiagnostics, Pipeline, "TopLevelTrackedResourceCollection.GetAll", "value", "nextLink", cancellationToken); + HttpMessage FirstPageRequest(int? pageSizeHint) => _topLevelTrackedResourceTopLevelRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _topLevelTrackedResourceTopLevelRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName); + return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new TopLevelTrackedResource(Client, TopLevelTrackedResourceData.DeserializeTopLevelTrackedResourceData(e)), _topLevelTrackedResourceTopLevelClientDiagnostics, Pipeline, "TopLevelTrackedResourceCollection.GetAll", "value", "nextLink", cancellationToken); } /// @@ -307,7 +307,7 @@ public virtual Pageable GetAll(CancellationToken cancel /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -331,11 +331,11 @@ public virtual async Task> ExistsAsync(string topLevelTrackedReso { Argument.AssertNotNullOrEmpty(topLevelTrackedResourceName, nameof(topLevelTrackedResourceName)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.Exists"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.Exists"); scope.Start(); try { - var response = await _topLevelTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); + var response = await _topLevelTrackedResourceTopLevelRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); return Response.FromValue(response.Value != null, response.GetRawResponse()); } catch (Exception e) @@ -350,7 +350,7 @@ public virtual async Task> ExistsAsync(string topLevelTrackedReso /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -374,11 +374,11 @@ public virtual Response Exists(string topLevelTrackedResourceName, Cancell { Argument.AssertNotNullOrEmpty(topLevelTrackedResourceName, nameof(topLevelTrackedResourceName)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.Exists"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.Exists"); scope.Start(); try { - var response = _topLevelTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken: cancellationToken); + var response = _topLevelTrackedResourceTopLevelRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken: cancellationToken); return Response.FromValue(response.Value != null, response.GetRawResponse()); } catch (Exception e) @@ -393,7 +393,7 @@ public virtual Response Exists(string topLevelTrackedResourceName, Cancell /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -417,11 +417,11 @@ public virtual async Task> GetIfExists { Argument.AssertNotNullOrEmpty(topLevelTrackedResourceName, nameof(topLevelTrackedResourceName)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.GetIfExists"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.GetIfExists"); scope.Start(); try { - var response = await _topLevelTrackedResourceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); + var response = await _topLevelTrackedResourceTopLevelRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken: cancellationToken).ConfigureAwait(false); if (response.Value == null) return new NoValueResponse(response.GetRawResponse()); return Response.FromValue(new TopLevelTrackedResource(Client, response.Value), response.GetRawResponse()); @@ -438,7 +438,7 @@ public virtual async Task> GetIfExists /// /// /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} + /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName} /// /// /// Operation Id @@ -462,11 +462,11 @@ public virtual NullableResponse GetIfExists(string topL { Argument.AssertNotNullOrEmpty(topLevelTrackedResourceName, nameof(topLevelTrackedResourceName)); - using var scope = _topLevelTrackedResourceClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.GetIfExists"); + using var scope = _topLevelTrackedResourceTopLevelClientDiagnostics.CreateScope("TopLevelTrackedResourceCollection.GetIfExists"); scope.Start(); try { - var response = _topLevelTrackedResourceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken: cancellationToken); + var response = _topLevelTrackedResourceTopLevelRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, topLevelTrackedResourceName, cancellationToken: cancellationToken); if (response.Value == null) return new NoValueResponse(response.GetRawResponse()); return Response.FromValue(new TopLevelTrackedResource(Client, response.Value), response.GetRawResponse()); diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResourceData.Serialization.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResourceData.Serialization.cs similarity index 98% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResourceData.Serialization.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResourceData.Serialization.cs index 8bea8981f17..c45277a68a6 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResourceData.Serialization.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResourceData.Serialization.cs @@ -11,9 +11,9 @@ using System.Text.Json; using Azure.Core; using Azure.ResourceManager.Models; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { public partial class TopLevelTrackedResourceData : IUtf8JsonSerializable, IJsonModel { diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResourceData.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResourceData.cs similarity index 97% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResourceData.cs rename to test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResourceData.cs index cf8d2848084..f9edac183d3 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/src/Generated/TopLevelTrackedResourceData.cs +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/TopLevelTrackedResourceData.cs @@ -9,9 +9,9 @@ using System.Collections.Generic; using Azure.Core; using Azure.ResourceManager.Models; -using _Azure.ResourceManager.Models.Resources.Models; +using _Azure.ResourceManager.Resources.Models; -namespace _Azure.ResourceManager.Models.Resources +namespace _Azure.ResourceManager.Resources { /// /// A class representing the TopLevelTrackedResource data model. diff --git a/test/CadlRanchProjects/azure/resource-manager/resources/src/Properties/AssemblyInfo.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..e3ef788c5a9 --- /dev/null +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Properties/AssemblyInfo.cs @@ -0,0 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("_Azure.ResourceManager.Resources.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")] diff --git a/test/CadlRanchProjects/azure/resource-manager/resources/src/_Azure.ResourceManager.Resources.csproj b/test/CadlRanchProjects/azure/resource-manager/resources/src/_Azure.ResourceManager.Resources.csproj new file mode 100644 index 00000000000..61dfc471662 --- /dev/null +++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/_Azure.ResourceManager.Resources.csproj @@ -0,0 +1,10 @@ + + + This is the _Azure.ResourceManager.Resources client library for developing .NET applications with rich experience. + Azure SDK Code Generation _Azure.ResourceManager.Resources for Azure Data Plane + 1.0.0-beta.1 + _Azure.ResourceManager.Resources + $(RequiredTargetFrameworks) + true + + diff --git a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/tests/_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Tests.csproj b/test/CadlRanchProjects/azure/resource-manager/resources/tests/_Azure.ResourceManager.Resources.Tests.csproj similarity index 73% rename from test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/tests/_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Tests.csproj rename to test/CadlRanchProjects/azure/resource-manager/resources/tests/_Azure.ResourceManager.Resources.Tests.csproj index 3ef307e8e3d..dead2d03de0 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/common-types/managed-identity/tests/_Azure.ResourceManager.Models.CommonTypes.ManagedIdentity.Tests.csproj +++ b/test/CadlRanchProjects/azure/resource-manager/resources/tests/_Azure.ResourceManager.Resources.Tests.csproj @@ -6,6 +6,6 @@ - + diff --git a/test/CadlRanchProjects/azure/resource-manager/models/resources/tspCodeModel.json b/test/CadlRanchProjects/azure/resource-manager/resources/tspCodeModel.json similarity index 95% rename from test/CadlRanchProjects/azure/resource-manager/models/resources/tspCodeModel.json rename to test/CadlRanchProjects/azure/resource-manager/resources/tspCodeModel.json index 977519dd4c8..6542732f815 100644 --- a/test/CadlRanchProjects/azure/resource-manager/models/resources/tspCodeModel.json +++ b/test/CadlRanchProjects/azure/resource-manager/resources/tspCodeModel.json @@ -1,6 +1,6 @@ { "$id": "1", - "Name": "Azure.ResourceManager.Models.Resources", + "Name": "Azure.ResourceManager.Resources", "ApiVersions": [ "2023-12-01-preview" ], @@ -9,7 +9,7 @@ "$id": "2", "kind": "enum", "name": "ProvisioningState", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.ProvisioningState", + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.ProvisioningState", "valueType": { "$id": "3", "kind": "string", @@ -242,7 +242,7 @@ "$id": "28", "kind": "enum", "name": "Versions", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.Versions", + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.Versions", "valueType": { "$id": "29", "kind": "string", @@ -282,7 +282,7 @@ "$id": "32", "kind": "model", "name": "SingletonTrackedResource", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.SingletonTrackedResource", + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.SingletonTrackedResource", "usage": "Input,Output,Json", "description": "Concrete tracked resource types can be created by aliasing this type using a specific property type.", "decorators": [], @@ -590,7 +590,7 @@ "$id": "63", "kind": "model", "name": "SingletonTrackedResourceProperties", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.SingletonTrackedResourceProperties", + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.SingletonTrackedResourceProperties", "usage": "Input,Output,Json", "description": "Singleton Arm Resource Properties.", "decorators": [], @@ -609,7 +609,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.SingletonTrackedResourceProperties.provisioningState" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.SingletonTrackedResourceProperties.provisioningState" }, { "$id": "65", @@ -629,7 +629,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.SingletonTrackedResourceProperties.description" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.SingletonTrackedResourceProperties.description" } ] }, @@ -638,7 +638,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.SingletonTrackedResource.properties" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.SingletonTrackedResource.properties" } ] }, @@ -919,7 +919,7 @@ "$id": "91", "kind": "model", "name": "NestedProxyResource", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NestedProxyResource", + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.NestedProxyResource", "usage": "Input,Output,Json", "description": "Nested child of Top Level Tracked Resource.", "decorators": [], @@ -947,7 +947,7 @@ "$id": "94", "kind": "model", "name": "NestedProxyResourceProperties", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NestedProxyResourceProperties", + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.NestedProxyResourceProperties", "usage": "Input,Output,Json", "description": "Nested Proxy Resource Properties.", "decorators": [], @@ -966,7 +966,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NestedProxyResourceProperties.provisioningState" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.NestedProxyResourceProperties.provisioningState" }, { "$id": "96", @@ -986,7 +986,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NestedProxyResourceProperties.description" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.NestedProxyResourceProperties.description" } ] }, @@ -995,7 +995,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NestedProxyResource.properties" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.NestedProxyResource.properties" } ] }, @@ -1070,7 +1070,7 @@ "$id": "104", "kind": "model", "name": "TopLevelTrackedResource", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResource", + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevelTrackedResource", "usage": "Input,Output,Json", "description": "Concrete tracked resource types can be created by aliasing this type using a specific property type.", "decorators": [], @@ -1088,7 +1088,7 @@ "$id": "106", "kind": "model", "name": "TopLevelTrackedResourceProperties", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResourceProperties", + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevelTrackedResourceProperties", "usage": "Input,Output,Json", "description": "Top Level Arm Resource Properties.", "decorators": [], @@ -1107,7 +1107,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResourceProperties.provisioningState" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevelTrackedResourceProperties.provisioningState" }, { "$id": "108", @@ -1127,7 +1127,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResourceProperties.description" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevelTrackedResourceProperties.description" } ] }, @@ -1136,7 +1136,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResource.properties" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevelTrackedResource.properties" } ] }, @@ -1208,7 +1208,7 @@ "$id": "116", "kind": "model", "name": "NotificationDetails", - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NotificationDetails", + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.NotificationDetails", "usage": "Input,Json", "description": "The details of a user notification.", "decorators": [], @@ -1231,7 +1231,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NotificationDetails.message" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.NotificationDetails.message" }, { "$id": "119", @@ -1251,7 +1251,7 @@ "discriminator": false, "flatten": false, "decorators": [], - "crossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NotificationDetails.urgent" + "crossLanguageDefinitionId": "Azure.ResourceManager.Resources.NotificationDetails.urgent" } ] } @@ -1302,7 +1302,7 @@ }, { "$id": "127", - "Name": "TopLevelTrackedResources", + "Name": "TopLevel", "Operations": [ { "$id": "128", @@ -1495,11 +1495,11 @@ "HttpMethod": "GET", "RequestBodyMediaType": "None", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}", "BufferResponse": true, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResources.get", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevel.get", "Decorators": [] }, { @@ -1753,7 +1753,7 @@ "HttpMethod": "PUT", "RequestBodyMediaType": "Json", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}", "RequestMediaTypes": [ "application/json" ], @@ -1774,7 +1774,7 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResources.createOrReplace", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevel.createOrReplace", "Decorators": [] }, { @@ -2022,7 +2022,7 @@ "HttpMethod": "PATCH", "RequestBodyMediaType": "Json", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}", "RequestMediaTypes": [ "application/json" ], @@ -2043,7 +2043,7 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": false, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResources.update", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevel.update", "Decorators": [] }, { @@ -2239,7 +2239,7 @@ "HttpMethod": "DELETE", "RequestBodyMediaType": "None", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}", "BufferResponse": true, "LongRunning": { "$id": "223", @@ -2254,7 +2254,7 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResources.delete", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevel.delete", "Decorators": [] }, { @@ -2398,7 +2398,7 @@ "HttpMethod": "GET", "RequestBodyMediaType": "None", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources", "BufferResponse": true, "Paging": { "$id": "239", @@ -2407,7 +2407,7 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResources.listByResourceGroup", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevel.listByResourceGroup", "Decorators": [] }, { @@ -2529,7 +2529,7 @@ "HttpMethod": "GET", "RequestBodyMediaType": "None", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources", + "Path": "/subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources", "BufferResponse": true, "Paging": { "$id": "252", @@ -2538,13 +2538,13 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResources.listBySubscription", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevel.listBySubscription", "Decorators": [] }, { "$id": "253", "Name": "actionSync", - "ResourceName": "TopLevelTrackedResources", + "ResourceName": "TopLevel", "Description": "A synchronous resource action that returns no content.", "Accessibility": "public", "Parameters": [ @@ -2744,14 +2744,14 @@ "HttpMethod": "POST", "RequestBodyMediaType": "Json", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/actionSync", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/actionSync", "RequestMediaTypes": [ "application/json" ], "BufferResponse": true, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.TopLevelTrackedResources.actionSync", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.TopLevel.actionSync", "Decorators": [] } ], @@ -2768,7 +2768,7 @@ }, { "$id": "274", - "Name": "NestedProxyResources", + "Name": "Nested", "Operations": [ { "$id": "275", @@ -2983,11 +2983,11 @@ "HttpMethod": "GET", "RequestBodyMediaType": "None", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}", "BufferResponse": true, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NestedProxyResources.get", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.Nested.get", "Decorators": [] }, { @@ -3263,7 +3263,7 @@ "HttpMethod": "PUT", "RequestBodyMediaType": "Json", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}", "RequestMediaTypes": [ "application/json" ], @@ -3284,7 +3284,7 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NestedProxyResources.createOrReplace", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.Nested.createOrReplace", "Decorators": [] }, { @@ -3554,7 +3554,7 @@ "HttpMethod": "PATCH", "RequestBodyMediaType": "Json", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}", "RequestMediaTypes": [ "application/json" ], @@ -3575,7 +3575,7 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": false, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NestedProxyResources.update", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.Nested.update", "Decorators": [] }, { @@ -3793,7 +3793,7 @@ "HttpMethod": "DELETE", "RequestBodyMediaType": "None", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}", "BufferResponse": true, "LongRunning": { "$id": "378", @@ -3808,7 +3808,7 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NestedProxyResources.delete", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.Nested.delete", "Decorators": [] }, { @@ -3974,7 +3974,7 @@ "HttpMethod": "GET", "RequestBodyMediaType": "None", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources", "BufferResponse": true, "Paging": { "$id": "396", @@ -3983,7 +3983,7 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.NestedProxyResources.listByTopLevelTrackedResource", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.Nested.listByTopLevelTrackedResource", "Decorators": [] } ], @@ -4000,7 +4000,7 @@ }, { "$id": "398", - "Name": "SingletonTrackedResources", + "Name": "Singleton", "Operations": [ { "$id": "399", @@ -4171,11 +4171,11 @@ "HttpMethod": "GET", "RequestBodyMediaType": "None", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default", "BufferResponse": true, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.SingletonTrackedResources.getByResourceGroup", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.Singleton.getByResourceGroup", "Decorators": [] }, { @@ -4407,7 +4407,7 @@ "HttpMethod": "PUT", "RequestBodyMediaType": "Json", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default", "RequestMediaTypes": [ "application/json" ], @@ -4428,7 +4428,7 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.SingletonTrackedResources.createOrUpdate", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.Singleton.createOrUpdate", "Decorators": [] }, { @@ -4618,14 +4618,14 @@ "HttpMethod": "PATCH", "RequestBodyMediaType": "Json", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default", "RequestMediaTypes": [ "application/json" ], "BufferResponse": true, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": false, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.SingletonTrackedResources.update", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.Singleton.update", "Decorators": [] }, { @@ -4769,7 +4769,7 @@ "HttpMethod": "GET", "RequestBodyMediaType": "None", "Uri": "{endpoint}", - "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources", + "Path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources", "BufferResponse": true, "Paging": { "$id": "474", @@ -4778,7 +4778,7 @@ }, "GenerateProtocolMethod": true, "GenerateConvenienceMethod": true, - "CrossLanguageDefinitionId": "Azure.ResourceManager.Models.Resources.SingletonTrackedResources.listByResourceGroup", + "CrossLanguageDefinitionId": "Azure.ResourceManager.Resources.Singleton.listByResourceGroup", "Decorators": [] } ], diff --git a/test/CadlRanchProjects/azure/resource-manager/resources/tspconfig.yaml b/test/CadlRanchProjects/azure/resource-manager/resources/tspconfig.yaml new file mode 100644 index 00000000000..3d14a9b6ba5 --- /dev/null +++ b/test/CadlRanchProjects/azure/resource-manager/resources/tspconfig.yaml @@ -0,0 +1,3 @@ +options: + "@azure-tools/typespec-csharp": + namespace: _Azure.ResourceManager.Resources \ No newline at end of file