@azure-tools/typespec-rust 0.41.5 → 0.42.0

package/README.md

@@ -1,6 +1,45 @@
 # TypeSpec Rust Generator
 
 The TypeSpec Rust generator is intended to be used with the TypeSpec compiler.
+Generated crates should forward their `default` feature to `azure_core/default`
+by setting `default = ["azure_core/default"]` in the `[features]` section of
+`Cargo.toml`. Declare the `azure_core` dependency with `default-features = false`,
+including in `[workspace.dependencies]` when inherited from a workspace.
+Together, these settings enable the default HTTP transport while allowing callers
+to disable it with `--no-default-features`.
+
+## Azure Resource Manager
+
+ARM services are detected from TypeSpec metadata. Generated crates enable
+`azure_core/unstable_resource_manager` and use Public cloud by default.
+For other clouds, pass the same cloud configuration to the credential and client.
+See the [default-cloud][default-cloud] and [custom-cloud][custom-cloud] examples.
+
+Generated pagers and pollers use shared Azure Core helpers, keeping paging and
+long-running operation behavior consistent with ARM conventions.
+
+[default-cloud]: test/other/resource_manager/examples/default_cloud.rs
+[custom-cloud]: test/other/resource_manager/examples/custom_cloud.rs
+
+## Fake servers
+
+Fake server generation is disabled by default. Opt in for data-plane or Resource
+Manager clients with the emitter option:
+
+```yaml
+options:
+  "@azure-tools/typespec-rust":
+    generate-fakes: true
+```
+
+Enable the generated crate's `unstable_fake` Cargo feature (which also enables
+`test`), implement its `clients::fake::<Name>Server` trait, and construct the client
+with `with_fake()`. No credential is needed. Fakes use the normal client pipeline,
+pagers, and pollers. See the offline [Key Vault secrets example][secrets-fake] and
+[Resource Manager LRO example][arm-fake].
+
+[secrets-fake]: test/sdk/keyvault_secrets/examples/secret_client_fake.rs
+[arm-fake]: test/other/resource_manager/examples/fake.rs
 
 ## Contributing
 

package/dist/src/codegen/cargotoml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cargotoml.d.ts","sourceRoot":"","sources":["../../../src/codegen/cargotoml.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,MAAM,CAkBvD"}
+{"version":3,"file":"cargotoml.d.ts","sourceRoot":"","sources":["../../../src/codegen/cargotoml.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,MAAM,CA4BvD"}

package/dist/src/codegen/cargotoml.js

@@ -14,15 +14,25 @@ export function emitCargoToml(crate) {
     content += 'edition.workspace = true\n';
     content += 'license.workspace = true\n';
     content += 'repository.workspace = true\n';
-    content += 'rust-version.workspace = true\n\n';
+    content += 'rust-version.workspace = true\n';
+    content += 'exclude.workspace = true\n\n';
     content += '[features]\n';
     content += 'default = ["azure_core/default"]\n';
+    if (crate.generateFakes) {
+        content += 'test = ["azure_core/test"]\n';
+        content += 'unstable_fake = ["test", "azure_core/unstable_fake"]\n';
+    }
     if (crate.dependencies.length > 0) {
         content += '\n[dependencies]\n';
         for (const dependency of crate.dependencies) {
             // dependency versions are managed by the workspace's Cargo.toml file
-            const features = dependency.features.length > 0 ? `, features = [${dependency.features.sort().map(f => `"${f}"`).join(', ')}]` : '';
-            content += `${dependency.name} = { workspace = true${features} }\n`;
+            const featureNames = new Set(dependency.features);
+            if (dependency.name === 'azure_core' && crate.type === 'azure-arm') {
+                featureNames.add('unstable_resource_manager');
+            }
+            const features = featureNames.size > 0 ? `, features = [${[...featureNames].sort().map(f => `"${f}"`).join(', ')}]` : '';
+            const defaults = dependency.name === 'azure_core' ? ', default-features = false' : '';
+            content += `${dependency.name} = { workspace = true${defaults}${features} }\n`;
         }
     }
     return content;

package/dist/src/codegen/cargotoml.js.map

@@ -1 +1 @@
-{"version":3,"file":"cargotoml.js","sourceRoot":"","sources":["../../../src/codegen/cargotoml.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAI/F;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,KAAiB;IAC7C,IAAI,OAAO,GAAG,sBAAsB,KAAK,CAAC,IAAI,iBAAiB,KAAK,CAAC,OAAO,KAAK,CAAC;IAClF,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,+BAA+B,CAAC;IAC3C,OAAO,IAAI,mCAAmC,CAAC;IAC/C,OAAO,IAAI,cAAc,CAAC;IAC1B,OAAO,IAAI,oCAAoC,CAAC;IAChD,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,oBAAoB,CAAC;QAChC,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YAC5C,qEAAqE;YACrE,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACpI,OAAO,IAAI,GAAG,UAAU,CAAC,IAAI,wBAAwB,QAAQ,MAAM,CAAC;QACtE,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"cargotoml.js","sourceRoot":"","sources":["../../../src/codegen/cargotoml.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAI/F;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,KAAiB;IAC7C,IAAI,OAAO,GAAG,sBAAsB,KAAK,CAAC,IAAI,iBAAiB,KAAK,CAAC,OAAO,KAAK,CAAC;IAClF,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,4BAA4B,CAAC;IACxC,OAAO,IAAI,+BAA+B,CAAC;IAC3C,OAAO,IAAI,iCAAiC,CAAC;IAC7C,OAAO,IAAI,8BAA8B,CAAC;IAC1C,OAAO,IAAI,cAAc,CAAC;IAC1B,OAAO,IAAI,oCAAoC,CAAC;IAChD,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACxB,OAAO,IAAI,8BAA8B,CAAC;QAC1C,OAAO,IAAI,wDAAwD,CAAC;IACtE,CAAC;IACD,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,oBAAoB,CAAC;QAChC,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YAC5C,qEAAqE;YACrE,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAClD,IAAI,UAAU,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACnE,YAAY,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACzH,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,EAAE,CAAC;YACtF,OAAO,IAAI,GAAG,UAAU,CAAC,IAAI,wBAAwB,QAAQ,GAAG,QAAQ,MAAM,CAAC;QACjF,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/src/codegen/clients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clients.d.ts","sourceRoot":"","sources":["../../../src/codegen/clients.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAGxC,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAG9C,yBAAyB;AACzB,MAAM,WAAW,aAAa;IAC5B,iCAAiC;IACjC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/B,uCAAuC;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC;CAC1B;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,GAAG,aAAa,GAAG,SAAS,CAwYnF"}
+{"version":3,"file":"clients.d.ts","sourceRoot":"","sources":["../../../src/codegen/clients.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAGxC,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAK9C,yBAAyB;AACzB,MAAM,WAAW,aAAa;IAC5B,iCAAiC;IACjC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/B,uCAAuC;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC;CAC1B;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,GAAG,aAAa,GAAG,SAAS,CA0VnF"}

package/dist/src/codegen/clients.js

@@ -10,6 +10,8 @@ import queryString from 'query-string';
 import { Use } from './use.js';
 import * as rust from '../codemodel/index.js';
 import * as utils from '../utils/utils.js';
+import { emitFakeCapture } from './fakes.js';
+import { methodParameters, requiredConstructorParameters, supplementalEndpoint } from './parameters.js';
 /**
  * emits the content for all client files
  *
@@ -88,46 +90,13 @@ export function emitClients(module) {
                 if (crate.type === 'azure-arm') {
                     use.add('azure_core', 'Error');
                     use.add('azure_core::error', 'ErrorKind');
-                    use.add('crate', 'Audience');
-                    // for ARM, derive endpoint and scope from cloud config
-                    use.add('azure_core::cloud', 'CloudConfiguration');
+                    use.add('azure_core::cloud::resource_manager', 'CloudConfigurationExt as _');
                     use.add('azure_core::http::policies', 'auth::BearerTokenAuthorizationPolicy', 'Policy');
-                    body += `${indent.push().get()}let (endpoint, scope) = ${helpers.buildMatch(indent, 'options.client_options.cloud.as_deref()', [
-                        {
-                            pattern: 'Some(CloudConfiguration::AzurePublic)',
-                            body: (indent) => `${indent.get()}(\n`
-                                + `${indent.push().get()}"https://management.azure.com".to_string(),`
-                                + `\n${indent.get()}"https://management.azure.com/.default".to_string(),`
-                                + `\n${indent.pop().get()})\n`
-                        },
-                        {
-                            pattern: 'Some(CloudConfiguration::AzureGovernment)',
-                            body: (indent) => `${indent.get()}`
-                                + `(\n${indent.push().get()}"https://management.usgovcloudapi.net".to_string(),`
-                                + `\n${indent.get()}"https://management.usgovcloudapi.net/.default".to_string(),`
-                                + `\n${indent.pop().get()})\n`
-                        },
-                        {
-                            pattern: 'Some(CloudConfiguration::AzureChina)',
-                            body: (indent) => `${indent.get()}`
-                                + `(\n${indent.push().get()}"https://management.chinacloudapi.cn".to_string(),`
-                                + `\n${indent.get()}"https://management.chinacloudapi.cn/.default".to_string(),`
-                                + `\n${indent.pop().get()})\n`
-                        },
-                        {
-                            pattern: 'Some(CloudConfiguration::Custom(custom))',
-                            body: (indent) => `${indent.get()}{\n`
-                                + `${indent.push().get()}let audience = custom.audiences.get::<Audience>().ok_or_else(|| { Error::new(ErrorKind::Credential, "missing custom cloud configuration audience")})?;\n`
-                                + `${indent.get()}(audience.to_string(), format!("{}/.default", audience))\n`
-                                + `${indent.pop().get()}}\n`
-                        },
-                        {
-                            pattern: '_',
-                            body: (indent) => `${indent.get()}unreachable!()\n`
-                        },
-                    ])};\n`;
-                    body += `${indent.get()}let endpoint = Url::parse(&endpoint)?;\n`;
-                    body += `${indent.get()}let auth_policy: Arc<dyn Policy> = Arc::new(BearerTokenAuthorizationPolicy::new(credential, vec![scope]));\n`;
+                    body += `${indent.push().get()}let cloud = options.client_options.cloud.as_deref().unwrap_or_default();\n`;
+                    body += `${indent.get()}let endpoint = cloud.endpoint().ok_or_else(|| Error::new(ErrorKind::Other, "missing Resource Manager endpoint"))?;\n`;
+                    body += `${indent.get()}let endpoint = Url::parse(endpoint)?;\n`;
+                    body += `${indent.get()}let scope = cloud.default_scope()?.into_owned();\n`;
+                    body += `${indent.get()}let auth_policy: Arc<dyn Policy> = Arc::new(BearerTokenAuthorizationPolicy::new(credential, vec![scope]).with_options((&options.client_options).into()));\n`;
                     hasAuthPolicy = true;
                 }
                 else {
@@ -138,21 +107,7 @@ export function emitClients(module) {
                         condition: `!${endpointParamName}.scheme().starts_with("http")`,
                         body: (indent) => `${indent.get()}return Err(azure_core::Error::with_message(azure_core::error::ErrorKind::Other, format!("{${endpointParamName}} must use http(s)")));\n`,
                     })}`;
-                    // construct the supplemental path and join it to the endpoint
-                    if (client.constructable.endpoint) {
-                        const supplementalEndpoint = client.constructable.endpoint;
-                        if (supplementalEndpoint.parameters.length > 0) {
-                            body += `${indent.get()}let mut host = String::from("${supplementalEndpoint.path}");\n`;
-                            for (const param of supplementalEndpoint.parameters) {
-                                body += `${indent.get()}host = host.replace("{${param.segment}}", ${getClientSupplementalEndpointParamValue(param)});\n`;
-                            }
-                            body += `${indent.push().get()}${endpointParamName} = ${endpointParamName}.join(&host)?;\n`;
-                        }
-                        else {
-                            // there are no params for the supplemental host, so just append it
-                            body += `${indent.push().get()}${endpointParamName} = ${endpointParamName}.join("${supplementalEndpoint.path}")?;\n`;
-                        }
-                    }
+                    body += supplementalEndpoint(indent, endpointParamName, client.constructable.endpoint);
                     // if there's a credential param, create the necessary auth policy
                     const authPolicy = getAuthPolicy(constructor, use);
                     if (authPolicy) {
@@ -548,11 +503,7 @@ function getParamsBlockDocComment(indent, callable) {
  */
 function getConstructorParamsSig(params, options, use) {
     const paramsSig = new Array();
-    for (const param of params) {
-        if (param.optional) {
-            // optional params will be in the client options type
-            continue;
-        }
+    for (const param of requiredConstructorParameters(params)) {
         use.addForType(param.type);
         paramsSig.push(`${param.name}: ${helpers.getTypeDeclaration(param.type)}`);
     }
@@ -582,34 +533,18 @@ function getMethodParamsCountAndSig(method, use) {
         }
     }
     else {
-        const emittedGroups = new Set();
         for (const param of method.params) {
-            if (param.group) {
-                if (!emittedGroups.has(param.group.name)) {
-                    emittedGroups.add(param.group.name);
-                    // required parameter group appears as a single struct parameter in the method signature
-                    paramsSig.push(`${param.group.name}: ${helpers.getTypeDeclaration(param.group.type, 'anonymous')}`);
-                    ++count;
-                }
-                continue;
-            }
             const paramType = helpers.unwrapType(param.type);
-            if (paramType.kind === 'literal') {
-                // literal params are embedded directly in the code (e.g. accept header param)
-                continue;
-            }
-            else if (paramType.kind === 'enumValue') {
-                // enum values are treated like literals, we just need to use their type
+            if (!param.group && paramType.kind === 'enumValue') {
                 use.addForType(paramType.type);
-                continue;
-            }
-            // don't add client or optional params to the method param sig
-            if (param.location === 'method' && !param.optional) {
-                use.addForType(param.kind === 'partialBody' ? param.paramType : param.type);
-                paramsSig.push(`${param.name}: ${formatParamTypeName(param)}`);
-                ++count;
             }
         }
+        for (const param of methodParameters(method)) {
+            use.addForType(param.type);
+            const grouped = method.params.some(p => { var _a; return ((_a = p.group) === null || _a === void 0 ? void 0 : _a.name) === param.name; });
+            paramsSig.push(`${param.name}: ${param.mut ? 'mut ' : ''}${helpers.getTypeDeclaration(param.type, grouped ? 'anonymous' : undefined)}`);
+            ++count;
+        }
         paramsSig.push(`${method.options.name}: ${helpers.getTypeDeclaration(method.options.type, 'anonymous')}`);
         ++count;
     }
@@ -673,7 +608,7 @@ function getAuthPolicy(ctor, use) {
             for (const scope of arcTokenCred.scopes) {
                 scopes.push(`"${scope}"`);
             }
-            return `let auth_policy: Arc<dyn Policy> = Arc::new(BearerTokenAuthorizationPolicy::new(credential, vec![${scopes.join(', ')}]));`;
+            return `let auth_policy: Arc<dyn Policy> = Arc::new(BearerTokenAuthorizationPolicy::new(credential, vec![${scopes.join(', ')}]).with_options((&options.client_options).into()));`;
         }
     }
     return undefined;
@@ -812,10 +747,10 @@ function getMethodParamGroup(method) {
     };
 }
 /**
- * wraps the emitted code emitted by setter in a "let Some" block
+ * wraps the code emitted by setter in a presence check
  * if the parameter is optional, else the value of setter is returned.
  *
- * NOTE: for optional params, by convention, we'll create a local named param.name.
+ * NOTE: for optional non-constant params, we'll create a local named param.name.
  * setter MUST reference by param.name so it works for optional and required params.
  *
  * @param indent the indentation helper currently in scope
@@ -834,8 +769,9 @@ function getParamValueHelper(indent, param, setter, optionsPrefix = 'options.')
             asRefOrClone = '.as_ref()';
         }
         // optional params are in the unwrapped options local var
+        const paramRef = `${param.location === 'client' ? 'self.' : optionsPrefix}${param.name}`;
         const op = indent.get() + helpers.buildIfBlock(indent, {
-            condition: `let Some(${param.name}) = ${param.location === 'client' ? 'self.' : optionsPrefix}${param.name}${asRefOrClone}`,
+            condition: param.type.kind === 'enumValue' ? `${paramRef}.is_some()` : `let Some(${param.name}) = ${paramRef}${asRefOrClone}`,
             body: setter,
         });
         return op + '\n';
@@ -1280,6 +1216,7 @@ function getAsyncMethodBody(indent, use, client, method) {
     const paramGroups = getMethodParamGroup(method);
     let body = checkEmptyRequiredPathParams(indent, paramGroups.path);
     body += 'let options = options.unwrap_or_default();\n';
+    body += emitFakeCapture(client, method);
     body += `${indent.get()}let ctx = options.method_options.context.to_borrowed();\n`;
     body += `${indent.get()}let ${urlVarNeedsMut(paramGroups, method)}${urlVarName} = self.${client.endpoint.name}.clone();\n`;
     body += constructUrl(indent, use, method, paramGroups, urlVarName);
@@ -1412,7 +1349,8 @@ function getLroMonitorHelperStruct(indent: helpers.indentation, client: rust.Cli
  * @returns the contents of the method body
  */
 function getPageableMethodBody(indent, use, client, method) {
-    var _a, _b, _c;
+    var _a, _b;
+    var _c;
     use.add('azure_core::http', 'Method', 'Request', 'Url');
     use.add('azure_core::http::pager', 'PagerResult', 'PagerState');
     use.add('azure_core', 'Result');
@@ -1423,6 +1361,7 @@ function getPageableMethodBody(indent, use, client, method) {
     const pageableResponseHelperStruct = getPageableResponseHelperStruct(indent, client, method);
     let body = checkEmptyRequiredPathParams(indent, paramGroups.path);
     body += 'let options = options.unwrap_or_default().into_owned();\n';
+    body += emitFakeCapture(client, method);
     body += `${indent.get()}let pipeline = self.pipeline.clone();\n`;
     body += `${indent.get()}let ${urlVarNeedsMut(paramGroups, method)}${urlVar} = self.${client.endpoint.name}.clone();\n`;
     body += constructUrl(indent, use, method, paramGroups, urlVar);
@@ -1547,7 +1486,7 @@ function getPageableMethodBody(indent, use, client, method) {
         use.add('azure_core', bodyFormat, 'http::RawResponse');
         body += `${indent.get()}let (status, headers, body) = rsp.deconstruct();\n`;
         const deserialize = `${bodyFormat}::from_${bodyFormat}`;
-        body += `${indent.get()}let res: ${(_b = pageableResponseHelperStruct === null || pageableResponseHelperStruct === void 0 ? void 0 : pageableResponseHelperStruct.typeName) !== null && _b !== void 0 ? _b : helpers.getTypeDeclaration(helpers.unwrapType(method.returns.type))} = ${deserialize}(&body)?;\n`;
+        body += `${indent.get()}let res: ${(_c = pageableResponseHelperStruct === null || pageableResponseHelperStruct === void 0 ? void 0 : pageableResponseHelperStruct.typeName) !== null && _c !== void 0 ? _c : helpers.getTypeDeclaration(helpers.unwrapType(method.returns.type))} = ${deserialize}(&body)?;\n`;
         body += `${indent.get()}let rsp = RawResponse::from_bytes(status, headers, body).into();\n`;
     }
     if (method.strategy) {
@@ -1615,7 +1554,7 @@ function getPageableMethodBody(indent, use, client, method) {
         // non-continuation case, so we don't need to worry about next links, continuation tokens, etc...
         body += `${indent.get()}Ok(PagerResult::Done { response: rsp.into() })\n`;
     }
-    if (((_c = method.strategy) === null || _c === void 0 ? void 0 : _c.kind) === 'nextLink') {
+    if (((_b = method.strategy) === null || _b === void 0 ? void 0 : _b.kind) === 'nextLink') {
         body += `${indent.pop().get()}}\n`;
     }
     body += `${indent.pop().get()}})\n`; // end Box::pin(async move {
@@ -1633,8 +1572,60 @@ function getPageableMethodBody(indent, use, client, method) {
  * @param method the method for the body to build
  * @returns the contents of the method body
  */
+function getResourceManagerLroMethodBody(crate, indent, use, client, method) {
+    use.add('azure_core::http', 'Method', 'Request');
+    use.addForType(helpers.unwrapType(method.returns.type));
+    use.add('azure_core::http::poller::resource_manager', 'new_poller');
+    const params = getMethodParamGroup(method);
+    const url = helpers.getUniqueVarName(method.params, ['url', 'url_var']);
+    let body = 'let options = options.unwrap_or_default().into_owned();\n';
+    body += emitFakeCapture(client, method);
+    body += `${indent.get()}let ${urlVarNeedsMut(params, method)}${url} = self.${client.endpoint.name}.clone();\n`;
+    body += constructUrl(indent, use, method, params, url);
+    const request = constructRequest(indent, use, method, params, false, url, false, params.body !== undefined || params.partialBody.length > 0);
+    body += request.content;
+    let finalState = 'None';
+    const selection = method.resourceManagerFinalState;
+    if (selection) {
+        use.add('azure_core::http::poller::resource_manager', 'FinalStateVia');
+        let callback = '';
+        if (selection.selector === 'OperationLocation') {
+            const path = selection.resultPath;
+            callback = '( |response| {\n';
+            if (path.length > 0) {
+                crate.addDependency(new rust.CrateDependency('serde_json', ['raw_value']));
+                use.add('azure_core', 'Bytes');
+                use.add('azure_core::http', 'RawResponse');
+                indent.push();
+                for (let i = 0; i < path.length; ++i) {
+                    callback += `${indent.get()}#[derive(serde::Deserialize)]\n`;
+                    callback += `${indent.get()}struct ResultEnvelope${i}<'a> {\n`;
+                    callback += `${indent.push().get()}#[serde(borrow, rename = ${JSON.stringify(path[i])})]\n`;
+                    callback += `${indent.get()}value: ${i === path.length - 1 ? "&'a serde_json::value::RawValue" : `ResultEnvelope${i + 1}<'a>`},\n`;
+                    callback += `${indent.pop().get()}}\n`;
+                }
+                callback += `${indent.get()}let (status, headers, body) = response.deconstruct();\n`;
+                callback += `${indent.get()}let bytes = Bytes::from(body);\n`;
+                callback += `${indent.get()}let envelope: ResultEnvelope0<'_> = serde_json::from_slice(&bytes)?;\n`;
+                callback += `${indent.get()}let result = bytes.slice_ref(envelope${'.value'.repeat(path.length)}.get().as_bytes());\n`;
+                callback += `${indent.get()}Ok(RawResponse::from_bytes(status, headers, result).into())\n`;
+                indent.pop();
+            }
+            else {
+                callback += `${indent.get()}Ok(response.to_raw_response().into())\n`;
+            }
+            callback += `${indent.get()}})`;
+        }
+        finalState = `Some(FinalStateVia::${selection.selector}${callback})`;
+    }
+    body += `${indent.get()}Ok(new_poller(self.pipeline.clone(), ${request.requestVarName}, ${finalState}, Some(options.method_options)))\n`;
+    return body;
+}
 function getLroMethodBody(crate, indent, use, client, method) {
     var _a;
+    if (crate.type === 'azure-arm') {
+        return getResourceManagerLroMethodBody(crate, indent, use, client, method);
+    }
     let pollingStepHeaderName = undefined;
     for (const header of ['operation-location', 'azure-asyncoperation', 'location']) {
         if ((_a = method.responseHeaders) === null || _a === void 0 ? void 0 : _a.headers.some(h => h.header.toLowerCase() === header)) {
@@ -1654,6 +1645,7 @@ function getLroMethodBody(crate, indent, use, client, method) {
     const paramGroups = getMethodParamGroup(method);
     const urlVar = helpers.getUniqueVarName(method.params, ['url', 'url_var']);
     let body = 'let options = options.unwrap_or_default().into_owned();\n';
+    body += emitFakeCapture(client, method);
     body += `${indent.get()}let pipeline = self.pipeline.clone();\n`;
     body += `${indent.get()}let ${urlVarNeedsMut(paramGroups, method)}${urlVar} = self.${client.endpoint.name}.clone();\n`;
     body += constructUrl(indent, use, method, paramGroups, urlVar);
@@ -1730,64 +1722,13 @@ function getLroMethodBody(crate, indent, use, client, method) {
             }
         }
     }
-    // Match an ARM PUT operation ("create or update"), which may have immediate 200 OK response with no headers and no poller status
-    const isArmPutLro = bodyFormat === 'json'
-        && method.httpMethod === 'put'
-        && method.returns.type.resultType !== undefined
-        && method.finalResultStrategy.kind === 'header'
-        && method.finalResultStrategy.headerName === 'azure-asyncoperation'
-        && pollingStepHeaderName === 'azure-asyncoperation'
-        && method.statusCodes.some(sc => sc == 200)
-        && method.statusCodes.some(sc => sc == 201);
-    // Match an ARM PATCH operation ("update"), which may have immediate 200 OK response with no headers and no poller status
-    const isArmPatchLro = bodyFormat === 'json'
-        && method.httpMethod === 'patch'
-        && method.returns.type.resultType !== undefined
-        && method.finalResultStrategy.kind === 'header'
-        && method.finalResultStrategy.headerName === 'location'
-        && pollingStepHeaderName === 'location'
-        && method.statusCodes.some(sc => sc == 200)
-        && method.statusCodes.some(sc => sc == 202);
-    // Match an ARM POST operation ("export"), which may have empty initial response
-    const isArmPostLro = bodyFormat === 'json'
-        && method.httpMethod === 'post'
-        && method.returns.type.resultType !== undefined
-        && method.finalResultStrategy.kind === 'header'
-        && method.finalResultStrategy.headerName === 'location'
-        && pollingStepHeaderName === 'azure-asyncoperation'
-        && method.statusCodes.some(sc => sc == 200)
-        && method.statusCodes.some(sc => sc == 202);
-    // Match an ARM DELETE operation, which may have empty responses and only communicate via status codes
-    const isArmDeleteLro = bodyFormat === 'json'
-        && method.httpMethod === 'delete'
-        && method.returns.type.resultType === undefined
-        && method.finalResultStrategy.kind === 'header'
-        && method.finalResultStrategy.headerName === 'location'
-        && pollingStepHeaderName === 'location'
-        && method.statusCodes.some(sc => sc == 200)
-        && method.statusCodes.some(sc => sc == 202)
-        && method.statusCodes.some(sc => sc == 204);
-    if (isArmPutLro || isArmPatchLro) {
-        body += 'let original_url = url.clone();\n';
-    }
     body += `${indent.get()}Box::pin(async move {\n`;
     if (fallibleInitialPollerRequest) {
         body += `${indent.push().get()}let (mut ${initialRequestResult.requestVarName}, continuation) = poller_request?;\n`;
         indent.pop();
     }
     body += `${indent.push().get()}let rsp = pipeline.send(&ctx, &mut ${initialRequestResult.requestVarName}, ${getPipelineOptions(indent, use, method)}).await?;\n`;
-    const needsMutBody = isArmPutLro || isArmPatchLro || isArmPostLro || isArmDeleteLro;
-    body += `${indent.get()}let (status, headers, ${needsMutBody ? 'mut' : ''} body) = rsp.deconstruct();\n`;
-    if (isArmPostLro || isArmDeleteLro) {
-        body += `${indent.get()}if body.is_empty() {\n`;
-        let emptyBodyExpr = '"{}"';
-        if (isArmDeleteLro) {
-            use.add('azure_core::http', 'StatusCode');
-            emptyBodyExpr = `if status == StatusCode::NoContent { "{\\"status\\":\\"Succeeded\\"}" } else { "{}" }`;
-        }
-        body += `${indent.push().get()}body = azure_core::http::response::ResponseBody::from_bytes(${emptyBodyExpr});\n`;
-        body += `${indent.pop().get()}}\n`;
-    }
+    body += `${indent.get()}let (status, headers, body) = rsp.deconstruct();\n`;
     if (pollingStepHeaderName !== undefined) {
         body += `${indent.get()}let continuation = ${helpers.buildIfBlock(indent, {
             condition: `let Some(operation_location) = headers.get_optional_string(&HeaderName::from_static("${pollingStepHeaderName}"))`,
@@ -1806,21 +1747,6 @@ function getLroMethodBody(crate, indent, use, client, method) {
             body: (indent) => `${indent.get()}continuation\n`
         })};\n`;
     }
-    if (isArmPutLro || isArmPatchLro) {
-        use.add('azure_core::http', 'StatusCode');
-        body += `${indent.get()}let next_link = ${helpers.buildMatch(indent, '&continuation', [{
-                pattern: 'PollerContinuation::Links { next_link, .. }',
-                body: (indent) => `${indent.get()}next_link\n`,
-            }, {
-                pattern: '_',
-                body: (indent) => `${indent.get()}unreachable!()\n`,
-            }])};\n`;
-        body += `${indent.get()}let mut final_body = None;\n`;
-        body += `${indent.get()}if status == StatusCode::Ok && next_link.as_str() == original_url.as_str() {\n`;
-        body += `${indent.push().get()}final_body = Some(body);\n`;
-        body += `${indent.get()}body = azure_core::http::response::ResponseBody::from_bytes("{\\"status\\":\\"Succeeded\\"}");\n`;
-        body += `${indent.pop().get()}}\n`;
-    }
     if (method.finalResultStrategy.kind === 'header' && method.finalResultStrategy.headerName !== pollingStepHeaderName) { // separate link for picking up the result
         body += `${indent.get()}let continuation = ${helpers.buildIfBlock(indent, {
             condition: `let Some(final_link) = headers.get_optional_string(&HeaderName::from_static("${method.finalResultStrategy.headerName}"))`,
@@ -1854,10 +1780,7 @@ function getLroMethodBody(crate, indent, use, client, method) {
         body += `${indent.get()}let mut final_rsp: Option<RawResponse> = None;\n`;
         body += `if res.status() == PollerStatus::Succeeded {\n`;
         let responseBodyExpr = 'body.clone()';
-        if (isArmPutLro || isArmPatchLro) {
-            responseBodyExpr = 'if let Some(final_body) = final_body { final_body } else { body.clone() }';
-        }
-        else if (method.finalResultStrategy.propertyName !== undefined) {
+        if (method.finalResultStrategy.propertyName !== undefined) {
             responseBodyExpr = 'body';
             if (bodyFormat === 'json') {
                 crate.addDependency(new rust.CrateDependency('serde_json'));
@@ -1912,32 +1835,6 @@ function getLroMethodBody(crate, indent, use, client, method) {
     body += `${indent.pop().get()} Some(options.method_options),))`; // end Ok/Poller::new
     return body;
 }
-/**
- * contains the code to use when populating a client endpoint parameter value
- * from a parameter of that type.
- * @param param the param for which to get the value
- * @returns the code to use for the param's value
- */
-function getClientSupplementalEndpointParamValue(param) {
-    let paramName = param.name;
-    if (param.optional) {
-        paramName = 'options.' + paramName;
-    }
-    const unwrappedType = helpers.unwrapType(param.type);
-    switch (unwrappedType.kind) {
-        case 'String':
-            return `&${paramName}`;
-        case 'enum':
-            return `${paramName}.as_ref()`;
-        case 'offsetDateTime':
-        case 'scalar':
-            return `&${paramName}.to_string()`;
-        case 'str':
-            return paramName;
-        default:
-            throw new CodegenError('InternalError', `unhandled ${param.kind} param type kind ${param.type.kind}`);
-    }
-}
 /**
  * returns the code to use when populating a header/path/query value
  * from a parameter of that type. this will include any borrowing of
@@ -2058,6 +1955,7 @@ function getHeaderPathQueryParamValue(use, param, fromSelf, neverBorrow, overrid
                 break;
             case 'literal':
                 paramValue = `"${paramType.value}"`;
+                mustBorrow = false;
                 break;
             case 'offsetDateTime':
                 paramValue = encodeDateTime(paramType, paramName);