diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index ed9ffc7af9a0..17db02b9c5a4 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1828,6 +1828,16 @@ packages: lodash: 4.17.21 dev: false + /@microsoft/api-extractor-model@7.28.2(@types/node@14.18.63): + resolution: {integrity: sha512-vkojrM2fo3q4n4oPh4uUZdjJ2DxQ2+RnDQL/xhTWSRUNPF6P4QyrvY357HBxbnltKcYu+nNNolVqc6TIGQ73Ig==} + dependencies: + '@microsoft/tsdoc': 0.14.2 + '@microsoft/tsdoc-config': 0.16.2 + '@rushstack/node-core-library': 3.61.0(@types/node@14.18.63) + transitivePeerDependencies: + - '@types/node' + dev: false + /@microsoft/api-extractor-model@7.28.2(@types/node@16.18.58): resolution: {integrity: sha512-vkojrM2fo3q4n4oPh4uUZdjJ2DxQ2+RnDQL/xhTWSRUNPF6P4QyrvY357HBxbnltKcYu+nNNolVqc6TIGQ73Ig==} dependencies: @@ -1838,6 +1848,26 @@ packages: - '@types/node' dev: false + /@microsoft/api-extractor@7.38.0(@types/node@14.18.63): + resolution: {integrity: sha512-e1LhZYnfw+JEebuY2bzhw0imDCl1nwjSThTrQqBXl40hrVo6xm3j/1EpUr89QyzgjqmAwek2ZkIVZbrhaR+cqg==} + hasBin: true + dependencies: + '@microsoft/api-extractor-model': 7.28.2(@types/node@14.18.63) + '@microsoft/tsdoc': 0.14.2 + '@microsoft/tsdoc-config': 0.16.2 + '@rushstack/node-core-library': 3.61.0(@types/node@14.18.63) + '@rushstack/rig-package': 0.5.1 + '@rushstack/ts-command-line': 4.16.1 + colors: 1.2.5 + lodash: 4.17.21 + resolve: 1.22.8 + semver: 7.5.4 + source-map: 0.6.1 + typescript: 5.0.4 + transitivePeerDependencies: + - '@types/node' + dev: false + /@microsoft/api-extractor@7.38.0(@types/node@16.18.58): resolution: {integrity: sha512-e1LhZYnfw+JEebuY2bzhw0imDCl1nwjSThTrQqBXl40hrVo6xm3j/1EpUr89QyzgjqmAwek2ZkIVZbrhaR+cqg==} hasBin: true @@ -2449,6 +2479,24 @@ packages: rollup: 3.29.4 dev: false + /@rushstack/node-core-library@3.61.0(@types/node@14.18.63): + resolution: {integrity: sha512-tdOjdErme+/YOu4gPed3sFS72GhtWCgNV9oDsHDnoLY5oDfwjKUc9Z+JOZZ37uAxcm/OCahDHfuu2ugqrfWAVQ==} + peerDependencies: + '@types/node': '*' + peerDependenciesMeta: + '@types/node': + optional: true + dependencies: + '@types/node': 14.18.63 + colors: 1.2.5 + fs-extra: 7.0.1 + import-lazy: 4.0.0 + jju: 1.4.0 + resolve: 1.22.8 + semver: 7.5.4 + z-schema: 5.0.5 + dev: false + /@rushstack/node-core-library@3.61.0(@types/node@16.18.58): resolution: {integrity: sha512-tdOjdErme+/YOu4gPed3sFS72GhtWCgNV9oDsHDnoLY5oDfwjKUc9Z+JOZZ37uAxcm/OCahDHfuu2ugqrfWAVQ==} peerDependencies: @@ -2752,6 +2800,10 @@ packages: form-data: 4.0.0 dev: false + /@types/node@14.18.63: + resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==} + dev: false + /@types/node@16.18.58: resolution: {integrity: sha512-YGncyA25/MaVtQkjWW9r0EFBukZ+JulsLcVZBlGUfIb96OBMjkoRWwQo5IEWJ8Fj06Go3GHw+bjYDitv6BaGsA==} dev: false @@ -3132,6 +3184,11 @@ packages: uri-js: 4.4.1 dev: false + /ansi-colors@3.2.3: + resolution: {integrity: sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==} + engines: {node: '>=6'} + dev: false + /ansi-colors@4.1.1: resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==} engines: {node: '>=6'} @@ -3149,6 +3206,11 @@ packages: engines: {node: '>=4'} dev: false + /ansi-regex@4.1.1: + resolution: {integrity: sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==} + engines: {node: '>=6'} + dev: false + /ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} @@ -3269,6 +3331,17 @@ packages: es-shim-unscopables: 1.0.0 dev: false + /array.prototype.reduce@1.0.6: + resolution: {integrity: sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.1 + es-abstract: 1.22.2 + es-array-method-boxes-properly: 1.0.0 + is-string: 1.0.7 + dev: false + /arraybuffer.prototype.slice@1.0.2: resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==} engines: {node: '>= 0.4'} @@ -3611,6 +3684,21 @@ packages: get-func-name: 2.0.2 dev: false + /chokidar@3.3.0: + resolution: {integrity: sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==} + engines: {node: '>= 8.10.0'} + dependencies: + anymatch: 3.1.3 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.2.0 + optionalDependencies: + fsevents: 2.1.3 + dev: false + /chokidar@3.5.3: resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} engines: {node: '>= 8.10.0'} @@ -3665,6 +3753,14 @@ packages: engines: {node: '>= 10'} dev: false + /cliui@5.0.0: + resolution: {integrity: sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==} + dependencies: + string-width: 3.1.0 + strip-ansi: 5.2.0 + wrap-ansi: 5.1.0 + dev: false + /cliui@6.0.0: resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==} dependencies: @@ -3925,6 +4021,13 @@ packages: ms: 2.0.0 dev: false + /debug@3.2.6: + resolution: {integrity: sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==} + deprecated: Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797) + dependencies: + ms: 2.1.3 + dev: false + /debug@3.2.7: resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} dependencies: @@ -4104,6 +4207,11 @@ packages: resolution: {integrity: sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==} dev: false + /diff@3.5.0: + resolution: {integrity: sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==} + engines: {node: '>=0.3.1'} + dev: false + /diff@4.0.2: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} @@ -4198,6 +4306,10 @@ packages: resolution: {integrity: sha512-G+mpdiAySMuB7kesVRLuyvYRqDmshB7ReKEVuyBPkzQlmiDiLrt7hHHIy4Aff552bgknVN7B2/d3lzhGO5dvpQ==} dev: false + /emoji-regex@7.0.3: + resolution: {integrity: sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==} + dev: false + /emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} dev: false @@ -4306,6 +4418,10 @@ packages: which-typed-array: 1.1.11 dev: false + /es-array-method-boxes-properly@1.0.0: + resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==} + dev: false + /es-set-tostringtag@2.0.1: resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==} engines: {node: '>= 0.4'} @@ -4880,6 +4996,13 @@ packages: pkg-dir: 4.2.0 dev: false + /find-up@3.0.0: + resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==} + engines: {node: '>=6'} + dependencies: + locate-path: 3.0.0 + dev: false + /find-up@4.1.0: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} @@ -4905,6 +5028,13 @@ packages: rimraf: 3.0.2 dev: false + /flat@4.1.1: + resolution: {integrity: sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==} + hasBin: true + dependencies: + is-buffer: 2.0.5 + dev: false + /flat@5.0.2: resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} hasBin: true @@ -5028,6 +5158,15 @@ packages: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} dev: false + /fsevents@2.1.3: + resolution: {integrity: sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==} + engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} + os: [darwin] + deprecated: '"Please update to latest v2.3 or v2.2"' + requiresBuild: true + dev: false + optional: true + /fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -5144,6 +5283,17 @@ packages: path-scurry: 1.10.1 dev: false + /glob@7.1.3: + resolution: {integrity: sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==} + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 3.1.2 + once: 1.4.0 + path-is-absolute: 1.0.1 + dev: false + /glob@7.2.0: resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==} dependencies: @@ -5243,6 +5393,11 @@ packages: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} dev: false + /growl@1.10.5: + resolution: {integrity: sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==} + engines: {node: '>=4.x'} + dev: false + /guid-typescript@1.0.9: resolution: {integrity: sha512-Y8T4vYhEfwJOTbouREvG+3XDsjr8E3kIr7uf+JZ0BYloFsttiHU0WfvANVsR7TxNUJa/WpCnw/Ino/p+DeBhBQ==} dev: false @@ -5574,6 +5729,11 @@ packages: engines: {node: '>=0.10.0'} dev: false + /is-fullwidth-code-point@2.0.0: + resolution: {integrity: sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==} + engines: {node: '>=4'} + dev: false + /is-fullwidth-code-point@3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} @@ -5839,6 +5999,14 @@ packages: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} dev: false + /js-yaml@3.13.1: + resolution: {integrity: sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==} + hasBin: true + dependencies: + argparse: 1.0.10 + esprima: 4.0.1 + dev: false + /js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true @@ -6231,6 +6399,14 @@ packages: strip-bom: 3.0.0 dev: false + /locate-path@3.0.0: + resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==} + engines: {node: '>=6'} + dependencies: + p-locate: 3.0.0 + path-exists: 3.0.0 + dev: false + /locate-path@5.0.0: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} @@ -6304,6 +6480,13 @@ packages: chalk: 2.4.2 dev: false + /log-symbols@3.0.0: + resolution: {integrity: sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==} + engines: {node: '>=8'} + dependencies: + chalk: 2.4.2 + dev: false + /log-symbols@4.1.0: resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} engines: {node: '>=10'} @@ -6560,6 +6743,12 @@ packages: dom-walk: 0.1.2 dev: false + /minimatch@3.0.4: + resolution: {integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==} + dependencies: + brace-expansion: 1.1.11 + dev: false + /minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: @@ -6623,6 +6812,13 @@ packages: resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} dev: false + /mkdirp@0.5.5: + resolution: {integrity: sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==} + hasBin: true + dependencies: + minimist: 1.2.8 + dev: false + /mkdirp@0.5.6: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} hasBin: true @@ -6704,6 +6900,37 @@ packages: yargs-unparser: 2.0.0 dev: false + /mocha@7.2.0: + resolution: {integrity: sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==} + engines: {node: '>= 8.10.0'} + hasBin: true + dependencies: + ansi-colors: 3.2.3 + browser-stdout: 1.3.1 + chokidar: 3.3.0 + debug: 3.2.6 + diff: 3.5.0 + escape-string-regexp: 1.0.5 + find-up: 3.0.0 + glob: 7.1.3 + growl: 1.10.5 + he: 1.2.0 + js-yaml: 3.13.1 + log-symbols: 3.0.0 + minimatch: 3.0.4 + mkdirp: 0.5.5 + ms: 2.1.1 + node-environment-flags: 1.0.6 + object.assign: 4.1.0 + strip-json-comments: 2.0.1 + supports-color: 6.0.0 + which: 1.3.1 + wide-align: 1.1.3 + yargs: 13.3.2 + yargs-parser: 13.1.2 + yargs-unparser: 1.6.0 + dev: false + /mock-socket@9.3.1: resolution: {integrity: sha512-qxBgB7Qa2sEQgHFjj0dSigq7fX4k6Saisd5Nelwp2q8mlbAFh5dHV9JTTlF8viYJLSSWgMCZFUom8PJcMNBoJw==} engines: {node: '>= 8'} @@ -6725,6 +6952,10 @@ packages: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: false + /ms@2.1.1: + resolution: {integrity: sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==} + dev: false + /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} dev: false @@ -6815,6 +7046,13 @@ packages: engines: {node: '>=10.5.0'} dev: false + /node-environment-flags@1.0.6: + resolution: {integrity: sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==} + dependencies: + object.getownpropertydescriptors: 2.1.7 + semver: 5.7.2 + dev: false + /node-fetch@2.6.7: resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==} engines: {node: 4.x || >=6.0.0} @@ -6951,6 +7189,16 @@ packages: engines: {node: '>= 0.4'} dev: false + /object.assign@4.1.0: + resolution: {integrity: sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==} + engines: {node: '>= 0.4'} + dependencies: + define-properties: 1.2.1 + function-bind: 1.1.2 + has-symbols: 1.0.3 + object-keys: 1.1.1 + dev: false + /object.assign@4.1.4: resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==} engines: {node: '>= 0.4'} @@ -6970,6 +7218,17 @@ packages: es-abstract: 1.22.2 dev: false + /object.getownpropertydescriptors@2.1.7: + resolution: {integrity: sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==} + engines: {node: '>= 0.8'} + dependencies: + array.prototype.reduce: 1.0.6 + call-bind: 1.0.2 + define-properties: 1.2.1 + es-abstract: 1.22.2 + safe-array-concat: 1.0.1 + dev: false + /object.groupby@1.0.1: resolution: {integrity: sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==} dependencies: @@ -7089,6 +7348,13 @@ packages: yocto-queue: 0.1.0 dev: false + /p-locate@3.0.0: + resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==} + engines: {node: '>=6'} + dependencies: + p-limit: 2.3.0 + dev: false + /p-locate@4.1.0: resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} engines: {node: '>=8'} @@ -7174,6 +7440,11 @@ packages: resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} dev: false + /path-exists@3.0.0: + resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==} + engines: {node: '>=4'} + dev: false + /path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} @@ -7640,6 +7911,13 @@ packages: util-deprecate: 1.0.2 dev: false + /readdirp@3.2.0: + resolution: {integrity: sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==} + engines: {node: '>= 8'} + dependencies: + picomatch: 2.3.1 + dev: false + /readdirp@3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} @@ -7809,6 +8087,22 @@ packages: rollup: 3.29.4 dev: false + /rollup-plugin-sourcemaps@0.6.3(@types/node@14.18.63)(rollup@2.79.1): + resolution: {integrity: sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==} + engines: {node: '>=10.0.0'} + peerDependencies: + '@types/node': '>=10.0.0' + rollup: '>=0.31.2' + peerDependenciesMeta: + '@types/node': + optional: true + dependencies: + '@rollup/pluginutils': 3.1.0(rollup@2.79.1) + '@types/node': 14.18.63 + rollup: 2.79.1 + source-map-resolve: 0.6.0 + dev: false + /rollup-plugin-sourcemaps@0.6.3(@types/node@16.18.58)(rollup@2.79.1): resolution: {integrity: sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==} engines: {node: '>=10.0.0'} @@ -8227,6 +8521,23 @@ packages: engines: {node: '>=0.6.19'} dev: false + /string-width@2.1.1: + resolution: {integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==} + engines: {node: '>=4'} + dependencies: + is-fullwidth-code-point: 2.0.0 + strip-ansi: 4.0.0 + dev: false + + /string-width@3.1.0: + resolution: {integrity: sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==} + engines: {node: '>=6'} + dependencies: + emoji-regex: 7.0.3 + is-fullwidth-code-point: 2.0.0 + strip-ansi: 5.2.0 + dev: false + /string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} @@ -8302,6 +8613,13 @@ packages: ansi-regex: 3.0.1 dev: false + /strip-ansi@5.2.0: + resolution: {integrity: sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==} + engines: {node: '>=6'} + dependencies: + ansi-regex: 4.1.1 + dev: false + /strip-ansi@6.0.1: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} @@ -8368,6 +8686,13 @@ packages: has-flag: 3.0.0 dev: false + /supports-color@6.0.0: + resolution: {integrity: sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==} + engines: {node: '>=6'} + dependencies: + has-flag: 3.0.0 + dev: false + /supports-color@7.2.0: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} @@ -8511,6 +8836,37 @@ packages: code-block-writer: 12.0.0 dev: false + /ts-node@10.9.1(@types/node@14.18.63)(typescript@5.0.4): + resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} + hasBin: true + peerDependencies: + '@swc/core': '>=1.2.50' + '@swc/wasm': '>=1.2.50' + '@types/node': '*' + typescript: '>=2.7' + peerDependenciesMeta: + '@swc/core': + optional: true + '@swc/wasm': + optional: true + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.9 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.4 + '@types/node': 14.18.63 + acorn: 8.10.0 + acorn-walk: 8.2.0 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 5.0.4 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + dev: false + /ts-node@10.9.1(@types/node@16.18.58)(typescript@5.0.4): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true @@ -8926,6 +9282,12 @@ packages: isexe: 2.0.0 dev: false + /wide-align@1.1.3: + resolution: {integrity: sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==} + dependencies: + string-width: 2.1.1 + dev: false + /word-wrap@1.2.5: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} @@ -8935,6 +9297,15 @@ packages: resolution: {integrity: sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==} dev: false + /wrap-ansi@5.1.0: + resolution: {integrity: sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==} + engines: {node: '>=6'} + dependencies: + ansi-styles: 3.2.1 + string-width: 3.1.0 + strip-ansi: 5.2.0 + dev: false + /wrap-ansi@6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} @@ -9087,6 +9458,13 @@ packages: engines: {node: '>= 14'} dev: false + /yargs-parser@13.1.2: + resolution: {integrity: sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==} + dependencies: + camelcase: 5.3.1 + decamelize: 1.2.0 + dev: false + /yargs-parser@18.1.3: resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} engines: {node: '>=6'} @@ -9110,6 +9488,15 @@ packages: engines: {node: '>=12'} dev: false + /yargs-unparser@1.6.0: + resolution: {integrity: sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==} + engines: {node: '>=6'} + dependencies: + flat: 4.1.1 + lodash: 4.17.21 + yargs: 13.3.2 + dev: false + /yargs-unparser@2.0.0: resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==} engines: {node: '>=10'} @@ -9120,6 +9507,21 @@ packages: is-plain-obj: 2.1.0 dev: false + /yargs@13.3.2: + resolution: {integrity: sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==} + dependencies: + cliui: 5.0.0 + find-up: 3.0.0 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + require-main-filename: 2.0.0 + set-blocking: 2.0.0 + string-width: 3.1.0 + which-module: 2.0.1 + y18n: 4.0.3 + yargs-parser: 13.1.2 + dev: false + /yargs@15.4.1: resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} engines: {node: '>=8'} @@ -10602,31 +11004,34 @@ packages: dev: false file:projects/arm-billing.tgz: - resolution: {integrity: sha512-4IkNHGDrTNAeY3e1pnjIc9y2o5vtSR8Lyj/uwBu9iVFiTP8xSlqwNGf+p3PTIfZScwNMsrGA5VxsIHX2I6NDiQ==, tarball: file:projects/arm-billing.tgz} + resolution: {integrity: sha512-nZE+pXQBeKfIzSve9epOypPmCMR9jGinCUtsiqaFvDnURa3R6FUNYALBCURM1CwErcnnpvzS2iV/fXNbxuhg0Q==, tarball: file:projects/arm-billing.tgz} name: '@rush-temp/arm-billing' version: 0.0.0 dependencies: - '@microsoft/api-extractor': 7.38.0(@types/node@16.18.58) + '@azure/identity': 2.1.0 + '@microsoft/api-extractor': 7.38.0(@types/node@14.18.63) '@rollup/plugin-commonjs': 24.1.0(rollup@2.79.1) '@rollup/plugin-json': 6.0.1(rollup@2.79.1) '@rollup/plugin-multi-entry': 6.0.1(rollup@2.79.1) '@rollup/plugin-node-resolve': 13.3.0(rollup@2.79.1) '@types/chai': 4.3.8 - '@types/node': 16.18.58 + '@types/node': 14.18.63 chai: 4.3.10 cross-env: 7.0.3 - mkdirp: 1.0.4 - mocha: 10.2.0 - rimraf: 3.0.2 + dotenv: 16.3.1 + mkdirp: 2.1.6 + mocha: 7.2.0 + rimraf: 5.0.5 rollup: 2.79.1 - rollup-plugin-sourcemaps: 0.6.3(@types/node@16.18.58)(rollup@2.79.1) - ts-node: 10.9.1(@types/node@16.18.58)(typescript@5.0.4) + rollup-plugin-sourcemaps: 0.6.3(@types/node@14.18.63)(rollup@2.79.1) + ts-node: 10.9.1(@types/node@14.18.63)(typescript@5.0.4) tslib: 2.6.2 typescript: 5.0.4 uglify-js: 3.17.4 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' + - supports-color dev: false file:projects/arm-billingbenefits.tgz: diff --git a/sdk/billing/arm-billing/CHANGELOG.md b/sdk/billing/arm-billing/CHANGELOG.md index 85e658417871..5ddc2f79fcc8 100644 --- a/sdk/billing/arm-billing/CHANGELOG.md +++ b/sdk/billing/arm-billing/CHANGELOG.md @@ -1,15 +1,45 @@ # Release History + +## 5.0.0-beta.1 (2023-10-16) + +**Features** -## 4.1.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed + - Added Interface BillingProfileInfo + - Added Interface OperationsErrorDetails + - Added Interface OperationsErrorResponse + - Interface Agreement has a new optional parameter billingProfileInfo + - Interface BillingProfileListResult has a new optional parameter totalCount + - Enum KnownAcceptanceMode has a new value Implicit + - Enum KnownAcceptanceMode has a new value Offline + - Enum KnownAcceptanceMode has a new value Other + - Enum KnownAcceptanceMode has a new value PhysicalSign -### Other Changes +**Breaking Changes** + - Class BillingManagementClient has a new signature + - Interface AgreementsListByBillingAccountNextOptionalParams no longer has parameter expand + - Interface BillingAccountsListNextOptionalParams no longer has parameter expand + - Interface BillingPeriodsListNextOptionalParams no longer has parameter filter + - Interface BillingPeriodsListNextOptionalParams no longer has parameter skiptoken + - Interface BillingPeriodsListNextOptionalParams no longer has parameter top + - Interface BillingProfilesListByBillingAccountNextOptionalParams no longer has parameter expand + - Interface CustomersListByBillingAccountNextOptionalParams no longer has parameter filter + - Interface CustomersListByBillingAccountNextOptionalParams no longer has parameter search + - Interface CustomersListByBillingProfileNextOptionalParams no longer has parameter filter + - Interface CustomersListByBillingProfileNextOptionalParams no longer has parameter search + - Interface ProductsListByBillingAccountNextOptionalParams no longer has parameter filter + - Interface ProductsListByBillingProfileNextOptionalParams no longer has parameter filter + - Interface ProductsListByInvoiceSectionNextOptionalParams no longer has parameter filter + - Interface ReservationsListByBillingAccountNextOptionalParams no longer has parameter filter + - Interface ReservationsListByBillingAccountNextOptionalParams no longer has parameter orderby + - Interface ReservationsListByBillingAccountNextOptionalParams no longer has parameter refreshSummary + - Interface ReservationsListByBillingAccountNextOptionalParams no longer has parameter selectedState + - Interface ReservationsListByBillingProfileNextOptionalParams no longer has parameter filter + - Interface ReservationsListByBillingProfileNextOptionalParams no longer has parameter orderby + - Interface ReservationsListByBillingProfileNextOptionalParams no longer has parameter refreshSummary + - Interface ReservationsListByBillingProfileNextOptionalParams no longer has parameter selectedState + + ## 4.1.0 (2022-11-16) **Features** @@ -47,4 +77,4 @@ To understand the detail of the change, please refer to [Changelog](https://aka. To migrate the existing applications to the latest version, please refer to [Migration Guide](https://aka.ms/js-track2-migration-guide). -To learn more, please refer to our documentation [Quick Start](https://aka.ms/azsdk/js/mgmt/quickstart ). +To learn more, please refer to our documentation [Quick Start](https://aka.ms/js-track2-quickstart). diff --git a/sdk/billing/arm-billing/LICENSE b/sdk/billing/arm-billing/LICENSE index 5d1d36e0af80..3a1d9b6f24f7 100644 --- a/sdk/billing/arm-billing/LICENSE +++ b/sdk/billing/arm-billing/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2022 Microsoft +Copyright (c) 2023 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/sdk/billing/arm-billing/README.md b/sdk/billing/arm-billing/README.md index 55e805859e00..d78f72ab16ea 100644 --- a/sdk/billing/arm-billing/README.md +++ b/sdk/billing/arm-billing/README.md @@ -6,7 +6,7 @@ Billing client provides access to billing resources for Azure subscriptions. [Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/billing/arm-billing) | [Package (NPM)](https://www.npmjs.com/package/@azure/arm-billing) | -[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-billing) | +[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-billing?view=azure-node-preview) | [Samples](https://github.com/Azure-Samples/azure-samples-js-management) ## Getting started diff --git a/sdk/billing/arm-billing/_meta.json b/sdk/billing/arm-billing/_meta.json index 34c9ae4279a2..67819d5a1f9f 100644 --- a/sdk/billing/arm-billing/_meta.json +++ b/sdk/billing/arm-billing/_meta.json @@ -1,8 +1,8 @@ { - "commit": "d29e6eb4894005c52e67cb4b5ac3faf031113e7d", - "readme": "specification\\billing\\resource-manager\\readme.md", - "autorest_command": "autorest --version=3.8.4 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\billing\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.3.20221108.1 --generate-sample=true", + "commit": "d57d8e596f03edd3bd288c7a165d762a7c295a0c", + "readme": "specification/billing/resource-manager/readme.md", + "autorest_command": "autorest --version=3.9.7 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/billing/resource-manager/readme.md --use=@autorest/typescript@^6.0.4", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.4.2", - "use": "@autorest/typescript@6.0.0-rc.3.20221108.1" + "release_tool": "@azure-tools/js-sdk-release-tools@2.7.2", + "use": "@autorest/typescript@^6.0.4" } \ No newline at end of file diff --git a/sdk/billing/arm-billing/package.json b/sdk/billing/arm-billing/package.json index 856537b4ca0d..7eb7edd59701 100644 --- a/sdk/billing/arm-billing/package.json +++ b/sdk/billing/arm-billing/package.json @@ -3,17 +3,17 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for BillingManagementClient.", - "version": "4.1.1", + "version": "5.0.0-beta.1", "engines": { - "node": ">=16.0.0" + "node": ">=14.0.0" }, "dependencies": { - "@azure/core-lro": "^2.2.0", + "@azure/core-lro": "^2.5.4", "@azure/abort-controller": "^1.0.0", "@azure/core-paging": "^1.2.0", - "@azure/core-client": "^1.6.1", + "@azure/core-client": "^1.7.0", "@azure/core-auth": "^1.3.0", - "@azure/core-rest-pipeline": "^1.8.0", + "@azure/core-rest-pipeline": "^1.12.0", "tslib": "^2.2.0" }, "keywords": [ @@ -33,24 +33,24 @@ "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-multi-entry": "^6.0.0", "@rollup/plugin-node-resolve": "^13.1.3", - "mkdirp": "^1.0.4", + "mkdirp": "^2.1.2", "rollup": "^2.66.1", "rollup-plugin-sourcemaps": "^0.6.3", "typescript": "~5.0.0", "uglify-js": "^3.4.9", - "rimraf": "^3.0.0", - "@azure/identity": "^3.3.0", + "rimraf": "^5.0.0", + "dotenv": "^16.0.0", + "@azure/identity": "^2.0.1", "@azure-tools/test-recorder": "^3.0.0", "@azure-tools/test-credential": "^1.0.0", - "mocha": "^10.0.0", + "mocha": "^7.1.1", "@types/chai": "^4.2.8", "chai": "^4.2.0", "cross-env": "^7.0.2", - "@types/node": "^16.0.0", - "@azure/dev-tool": "^1.0.0", - "ts-node": "^10.0.0" + "@types/node": "^14.0.0", + "ts-node": "^10.0.0", + "@azure/dev-tool": "^1.0.0" }, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/billing/arm-billing", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" @@ -84,7 +84,7 @@ "extract-api": "api-extractor run --local", "lint": "echo skipped", "audit": "echo skipped", - "clean": "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log", + "clean": "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log", "build:node": "echo skipped", "build:browser": "echo skipped", "build:test": "echo skipped", @@ -112,12 +112,5 @@ ] }, "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-billing?view=azure-node-preview" - } -} + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/billing/arm-billing" +} \ No newline at end of file diff --git a/sdk/billing/arm-billing/review/arm-billing.api.md b/sdk/billing/arm-billing/review/arm-billing.api.md index b55d7775d90b..aca90d0ae1ac 100644 --- a/sdk/billing/arm-billing/review/arm-billing.api.md +++ b/sdk/billing/arm-billing/review/arm-billing.api.md @@ -6,9 +6,9 @@ import * as coreAuth from '@azure/core-auth'; import * as coreClient from '@azure/core-client'; +import { OperationState } from '@azure/core-lro'; import { PagedAsyncIterableIterator } from '@azure/core-paging'; -import { PollerLike } from '@azure/core-lro'; -import { PollOperationState } from '@azure/core-lro'; +import { SimplePollerLike } from '@azure/core-lro'; // @public export type AcceptanceMode = string; @@ -56,6 +56,7 @@ export type AddressValidationStatus = string; export interface Agreement extends Resource { readonly acceptanceMode?: AcceptanceMode; readonly agreementLink?: string; + readonly billingProfileInfo?: BillingProfileInfo; readonly category?: Category; readonly effectiveDate?: Date; readonly expirationDate?: Date; @@ -85,7 +86,6 @@ export type AgreementsGetResponse = Agreement; // @public export interface AgreementsListByBillingAccountNextOptionalParams extends coreClient.OperationOptions { - expand?: string; } // @public @@ -157,7 +157,7 @@ export interface BillingAccountListResult { // @public export interface BillingAccounts { - beginUpdate(billingAccountName: string, parameters: BillingAccountUpdateRequest, options?: BillingAccountsUpdateOptionalParams): Promise, BillingAccountsUpdateResponse>>; + beginUpdate(billingAccountName: string, parameters: BillingAccountUpdateRequest, options?: BillingAccountsUpdateOptionalParams): Promise, BillingAccountsUpdateResponse>>; beginUpdateAndWait(billingAccountName: string, parameters: BillingAccountUpdateRequest, options?: BillingAccountsUpdateOptionalParams): Promise; get(billingAccountName: string, options?: BillingAccountsGetOptionalParams): Promise; list(options?: BillingAccountsListOptionalParams): PagedAsyncIterableIterator; @@ -188,7 +188,6 @@ export type BillingAccountsListInvoiceSectionsByCreateSubscriptionPermissionResp // @public export interface BillingAccountsListNextOptionalParams extends coreClient.OperationOptions { - expand?: string; } // @public @@ -234,6 +233,7 @@ export class BillingManagementClient extends coreClient.ServiceClient { // (undocumented) $host: string; constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: BillingManagementClientOptionalParams); + constructor(credentials: coreAuth.TokenCredential, options?: BillingManagementClientOptionalParams); // (undocumented) address: Address; // (undocumented) @@ -275,7 +275,7 @@ export class BillingManagementClient extends coreClient.ServiceClient { // (undocumented) reservations: Reservations; // (undocumented) - subscriptionId: string; + subscriptionId?: string; // (undocumented) transactions: Transactions; } @@ -308,9 +308,6 @@ export type BillingPeriodsGetResponse = BillingPeriod; // @public export interface BillingPeriodsListNextOptionalParams extends coreClient.OperationOptions { - filter?: string; - skiptoken?: string; - top?: number; } // @public @@ -440,15 +437,23 @@ export interface BillingProfileCreationRequest { poNumber?: string; } +// @public +export interface BillingProfileInfo { + billingProfileDisplayName?: string; + billingProfileId?: string; + indirectRelationshipOrganizationName?: string; +} + // @public export interface BillingProfileListResult { readonly nextLink?: string; + readonly totalCount?: number; readonly value?: BillingProfile[]; } // @public export interface BillingProfiles { - beginCreateOrUpdate(billingAccountName: string, billingProfileName: string, parameters: BillingProfile, options?: BillingProfilesCreateOrUpdateOptionalParams): Promise, BillingProfilesCreateOrUpdateResponse>>; + beginCreateOrUpdate(billingAccountName: string, billingProfileName: string, parameters: BillingProfile, options?: BillingProfilesCreateOrUpdateOptionalParams): Promise, BillingProfilesCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(billingAccountName: string, billingProfileName: string, parameters: BillingProfile, options?: BillingProfilesCreateOrUpdateOptionalParams): Promise; get(billingAccountName: string, billingProfileName: string, options?: BillingProfilesGetOptionalParams): Promise; listByBillingAccount(billingAccountName: string, options?: BillingProfilesListByBillingAccountOptionalParams): PagedAsyncIterableIterator; @@ -479,7 +484,6 @@ export type BillingProfilesGetResponse = BillingProfile; // @public export interface BillingProfilesListByBillingAccountNextOptionalParams extends coreClient.OperationOptions { - expand?: string; } // @public @@ -777,7 +781,7 @@ export interface BillingSubscription extends Resource { // @public export interface BillingSubscriptions { - beginMove(billingAccountName: string, parameters: TransferBillingSubscriptionRequestProperties, options?: BillingSubscriptionsMoveOptionalParams): Promise, BillingSubscriptionsMoveResponse>>; + beginMove(billingAccountName: string, parameters: TransferBillingSubscriptionRequestProperties, options?: BillingSubscriptionsMoveOptionalParams): Promise, BillingSubscriptionsMoveResponse>>; beginMoveAndWait(billingAccountName: string, parameters: TransferBillingSubscriptionRequestProperties, options?: BillingSubscriptionsMoveOptionalParams): Promise; get(billingAccountName: string, options?: BillingSubscriptionsGetOptionalParams): Promise; listByBillingAccount(billingAccountName: string, options?: BillingSubscriptionsListByBillingAccountOptionalParams): PagedAsyncIterableIterator; @@ -931,8 +935,6 @@ export type CustomersGetResponse = Customer; // @public export interface CustomersListByBillingAccountNextOptionalParams extends coreClient.OperationOptions { - filter?: string; - search?: string; } // @public @@ -949,8 +951,6 @@ export type CustomersListByBillingAccountResponse = CustomerListResult; // @public export interface CustomersListByBillingProfileNextOptionalParams extends coreClient.OperationOptions { - filter?: string; - search?: string; } // @public @@ -1195,13 +1195,13 @@ export interface InvoiceListResult { // @public export interface Invoices { - beginDownloadBillingSubscriptionInvoice(invoiceName: string, downloadToken: string, options?: InvoicesDownloadBillingSubscriptionInvoiceOptionalParams): Promise, InvoicesDownloadBillingSubscriptionInvoiceResponse>>; + beginDownloadBillingSubscriptionInvoice(invoiceName: string, downloadToken: string, options?: InvoicesDownloadBillingSubscriptionInvoiceOptionalParams): Promise, InvoicesDownloadBillingSubscriptionInvoiceResponse>>; beginDownloadBillingSubscriptionInvoiceAndWait(invoiceName: string, downloadToken: string, options?: InvoicesDownloadBillingSubscriptionInvoiceOptionalParams): Promise; - beginDownloadInvoice(billingAccountName: string, invoiceName: string, downloadToken: string, options?: InvoicesDownloadInvoiceOptionalParams): Promise, InvoicesDownloadInvoiceResponse>>; + beginDownloadInvoice(billingAccountName: string, invoiceName: string, downloadToken: string, options?: InvoicesDownloadInvoiceOptionalParams): Promise, InvoicesDownloadInvoiceResponse>>; beginDownloadInvoiceAndWait(billingAccountName: string, invoiceName: string, downloadToken: string, options?: InvoicesDownloadInvoiceOptionalParams): Promise; - beginDownloadMultipleBillingProfileInvoices(billingAccountName: string, downloadUrls: string[], options?: InvoicesDownloadMultipleBillingProfileInvoicesOptionalParams): Promise, InvoicesDownloadMultipleBillingProfileInvoicesResponse>>; + beginDownloadMultipleBillingProfileInvoices(billingAccountName: string, downloadUrls: string[], options?: InvoicesDownloadMultipleBillingProfileInvoicesOptionalParams): Promise, InvoicesDownloadMultipleBillingProfileInvoicesResponse>>; beginDownloadMultipleBillingProfileInvoicesAndWait(billingAccountName: string, downloadUrls: string[], options?: InvoicesDownloadMultipleBillingProfileInvoicesOptionalParams): Promise; - beginDownloadMultipleBillingSubscriptionInvoices(downloadUrls: string[], options?: InvoicesDownloadMultipleBillingSubscriptionInvoicesOptionalParams): Promise, InvoicesDownloadMultipleBillingSubscriptionInvoicesResponse>>; + beginDownloadMultipleBillingSubscriptionInvoices(downloadUrls: string[], options?: InvoicesDownloadMultipleBillingSubscriptionInvoicesOptionalParams): Promise, InvoicesDownloadMultipleBillingSubscriptionInvoicesResponse>>; beginDownloadMultipleBillingSubscriptionInvoicesAndWait(downloadUrls: string[], options?: InvoicesDownloadMultipleBillingSubscriptionInvoicesOptionalParams): Promise; get(billingAccountName: string, invoiceName: string, options?: InvoicesGetOptionalParams): Promise; getById(invoiceName: string, options?: InvoicesGetByIdOptionalParams): Promise; @@ -1305,7 +1305,7 @@ export interface InvoiceSectionListWithCreateSubPermissionResult { // @public export interface InvoiceSections { - beginCreateOrUpdate(billingAccountName: string, billingProfileName: string, invoiceSectionName: string, parameters: InvoiceSection, options?: InvoiceSectionsCreateOrUpdateOptionalParams): Promise, InvoiceSectionsCreateOrUpdateResponse>>; + beginCreateOrUpdate(billingAccountName: string, billingProfileName: string, invoiceSectionName: string, parameters: InvoiceSection, options?: InvoiceSectionsCreateOrUpdateOptionalParams): Promise, InvoiceSectionsCreateOrUpdateResponse>>; beginCreateOrUpdateAndWait(billingAccountName: string, billingProfileName: string, invoiceSectionName: string, parameters: InvoiceSection, options?: InvoiceSectionsCreateOrUpdateOptionalParams): Promise; get(billingAccountName: string, billingProfileName: string, invoiceSectionName: string, options?: InvoiceSectionsGetOptionalParams): Promise; listByBillingProfile(billingAccountName: string, billingProfileName: string, options?: InvoiceSectionsListByBillingProfileOptionalParams): PagedAsyncIterableIterator; @@ -1443,7 +1443,11 @@ export type InvoiceType = string; export enum KnownAcceptanceMode { ClickToAccept = "ClickToAccept", ESignEmbedded = "ESignEmbedded", - ESignOffline = "ESignOffline" + ESignOffline = "ESignOffline", + Implicit = "Implicit", + Offline = "Offline", + Other = "Other", + PhysicalSign = "PhysicalSign" } // @public @@ -1732,6 +1736,18 @@ export interface Operations { list(options?: OperationsListOptionalParams): PagedAsyncIterableIterator; } +// @public +export interface OperationsErrorDetails { + readonly code?: string; + readonly message?: string; + readonly target?: string; +} + +// @public +export interface OperationsErrorResponse { + error?: OperationsErrorDetails; +} + // @public export interface OperationsListNextOptionalParams extends coreClient.OperationOptions { } @@ -1855,7 +1871,6 @@ export type ProductsGetResponse = Product; // @public export interface ProductsListByBillingAccountNextOptionalParams extends coreClient.OperationOptions { - filter?: string; } // @public @@ -1871,7 +1886,6 @@ export type ProductsListByBillingAccountResponse = ProductsListResult; // @public export interface ProductsListByBillingProfileNextOptionalParams extends coreClient.OperationOptions { - filter?: string; } // @public @@ -1901,7 +1915,6 @@ export type ProductsListByCustomerResponse = ProductsListResult; // @public export interface ProductsListByInvoiceSectionNextOptionalParams extends coreClient.OperationOptions { - filter?: string; } // @public @@ -2018,10 +2031,6 @@ export interface ReservationSkuProperty { // @public export interface ReservationsListByBillingAccountNextOptionalParams extends coreClient.OperationOptions { - filter?: string; - orderby?: string; - refreshSummary?: string; - selectedState?: string; } // @public @@ -2040,10 +2049,6 @@ export type ReservationsListByBillingAccountResponse = ReservationsListResult; // @public export interface ReservationsListByBillingProfileNextOptionalParams extends coreClient.OperationOptions { - filter?: string; - orderby?: string; - refreshSummary?: string; - selectedState?: string; } // @public diff --git a/sdk/billing/arm-billing/src/billingManagementClient.ts b/sdk/billing/arm-billing/src/billingManagementClient.ts index fadcf564aa66..03536ae2d496 100644 --- a/sdk/billing/arm-billing/src/billingManagementClient.ts +++ b/sdk/billing/arm-billing/src/billingManagementClient.ts @@ -24,13 +24,13 @@ import { TransactionsImpl, PoliciesImpl, BillingPropertyOperationsImpl, - OperationsImpl, BillingRoleDefinitionsImpl, BillingRoleAssignmentsImpl, AgreementsImpl, ReservationsImpl, EnrollmentAccountsImpl, - BillingPeriodsImpl + BillingPeriodsImpl, + OperationsImpl } from "./operations"; import { BillingAccounts, @@ -47,19 +47,19 @@ import { Transactions, Policies, BillingPropertyOperations, - Operations, BillingRoleDefinitions, BillingRoleAssignments, Agreements, Reservations, EnrollmentAccounts, - BillingPeriods + BillingPeriods, + Operations } from "./operationsInterfaces"; import { BillingManagementClientOptionalParams } from "./models"; export class BillingManagementClient extends coreClient.ServiceClient { $host: string; - subscriptionId: string; + subscriptionId?: string; /** * Initializes a new instance of the BillingManagementClient class. @@ -71,12 +71,26 @@ export class BillingManagementClient extends coreClient.ServiceClient { credentials: coreAuth.TokenCredential, subscriptionId: string, options?: BillingManagementClientOptionalParams + ); + constructor( + credentials: coreAuth.TokenCredential, + options?: BillingManagementClientOptionalParams + ); + constructor( + credentials: coreAuth.TokenCredential, + subscriptionIdOrOptions?: BillingManagementClientOptionalParams | string, + options?: BillingManagementClientOptionalParams ) { if (credentials === undefined) { throw new Error("'credentials' cannot be null"); } - if (subscriptionId === undefined) { - throw new Error("'subscriptionId' cannot be null"); + + let subscriptionId: string | undefined; + + if (typeof subscriptionIdOrOptions === "string") { + subscriptionId = subscriptionIdOrOptions; + } else if (typeof subscriptionIdOrOptions === "object") { + options = subscriptionIdOrOptions; } // Initializing default values for options @@ -88,7 +102,7 @@ export class BillingManagementClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-billing/4.1.1`; + const packageDetails = `azsdk-js-arm-billing/5.0.0-beta.1`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -155,13 +169,13 @@ export class BillingManagementClient extends coreClient.ServiceClient { this.transactions = new TransactionsImpl(this); this.policies = new PoliciesImpl(this); this.billingPropertyOperations = new BillingPropertyOperationsImpl(this); - this.operations = new OperationsImpl(this); this.billingRoleDefinitions = new BillingRoleDefinitionsImpl(this); this.billingRoleAssignments = new BillingRoleAssignmentsImpl(this); this.agreements = new AgreementsImpl(this); this.reservations = new ReservationsImpl(this); this.enrollmentAccounts = new EnrollmentAccountsImpl(this); this.billingPeriods = new BillingPeriodsImpl(this); + this.operations = new OperationsImpl(this); } billingAccounts: BillingAccounts; @@ -178,11 +192,11 @@ export class BillingManagementClient extends coreClient.ServiceClient { transactions: Transactions; policies: Policies; billingPropertyOperations: BillingPropertyOperations; - operations: Operations; billingRoleDefinitions: BillingRoleDefinitions; billingRoleAssignments: BillingRoleAssignments; agreements: Agreements; reservations: Reservations; enrollmentAccounts: EnrollmentAccounts; billingPeriods: BillingPeriods; + operations: Operations; } diff --git a/sdk/billing/arm-billing/src/lroImpl.ts b/sdk/billing/arm-billing/src/lroImpl.ts index 518d5f053b4e..dd803cd5e28c 100644 --- a/sdk/billing/arm-billing/src/lroImpl.ts +++ b/sdk/billing/arm-billing/src/lroImpl.ts @@ -6,29 +6,37 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. + +import { AbortSignalLike } from "@azure/abort-controller"; import { LongRunningOperation, LroResponse } from "@azure/core-lro"; -export class LroImpl implements LongRunningOperation { - constructor( - private sendOperationFn: (args: any, spec: any) => Promise>, - private args: Record, - private spec: { - readonly requestBody?: unknown; - readonly path?: string; - readonly httpMethod: string; - } & Record, - public requestPath: string = spec.path!, - public requestMethod: string = spec.httpMethod - ) {} - public async sendInitialRequest(): Promise> { - return this.sendOperationFn(this.args, this.spec); - } - public async sendPollRequest(path: string): Promise> { - const { requestBody, ...restSpec } = this.spec; - return this.sendOperationFn(this.args, { - ...restSpec, - path, - httpMethod: "GET" - }); - } +export function createLroSpec(inputs: { + sendOperationFn: (args: any, spec: any) => Promise>; + args: Record; + spec: { + readonly requestBody?: unknown; + readonly path?: string; + readonly httpMethod: string; + } & Record; +}): LongRunningOperation { + const { args, spec, sendOperationFn } = inputs; + return { + requestMethod: spec.httpMethod, + requestPath: spec.path!, + sendInitialRequest: () => sendOperationFn(args, spec), + sendPollRequest: ( + path: string, + options?: { abortSignal?: AbortSignalLike } + ) => { + const { requestBody, ...restSpec } = spec; + return sendOperationFn(args, { + ...restSpec, + httpMethod: "GET", + path, + abortSignal: options?.abortSignal + }); + } + }; } diff --git a/sdk/billing/arm-billing/src/models/index.ts b/sdk/billing/arm-billing/src/models/index.ts index 307984f5a9f9..90eb465662b2 100644 --- a/sdk/billing/arm-billing/src/models/index.ts +++ b/sdk/billing/arm-billing/src/models/index.ts @@ -376,6 +376,11 @@ export interface BillingProfileListResult { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly value?: BillingProfile[]; + /** + * Total number of records. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly totalCount?: number; /** * The link (url) to the next page of results. * NOTE: This property will not be serialized. It can only be populated by the server. @@ -671,60 +676,6 @@ export interface TransactionListResult { readonly nextLink?: string; } -/** The list of billing operations and a URL link to get the next set of results. */ -export interface OperationListResult { - /** - * The list of billing operations supported by the Microsoft.Billing resource provider. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly value?: Operation[]; - /** - * URL to get the next set of operation list results if there are any. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly nextLink?: string; -} - -/** A Billing REST API operation. */ -export interface Operation { - /** - * Operation name: {provider}/{resource}/{operation}. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly name?: string; - /** - * Identifies if the operation is a data operation. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly isDataAction?: boolean; - /** The object that represents the operation. */ - display?: OperationDisplay; -} - -/** The object that represents the operation. */ -export interface OperationDisplay { - /** - * Service provider: Microsoft.Billing. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly provider?: string; - /** - * Resource on which the operation is performed such as invoice and billing subscription. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly resource?: string; - /** - * Operation type such as read, write and delete. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly operation?: string; - /** - * Description of operation. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly description?: string; -} - /** The list of role definitions. */ export interface BillingRoleDefinitionListResult { /** @@ -767,6 +718,16 @@ export interface AgreementListResult { readonly nextLink?: string; } +/** Details about billing profile associated with agreement and available only for specific agreements. */ +export interface BillingProfileInfo { + /** The unique identifier for the billing profile. */ + billingProfileId?: string; + /** The name of the billing profile */ + billingProfileDisplayName?: string; + /** Billing account name. This property is available for a specific type of agreement. */ + indirectRelationshipOrganizationName?: string; +} + /** The details about a participant. */ export interface Participants { /** @@ -1016,6 +977,85 @@ export interface BillingPeriodsListResult { readonly nextLink?: string; } +/** The list of billing operations and a URL link to get the next set of results. */ +export interface OperationListResult { + /** + * The list of billing operations supported by the Microsoft.Billing resource provider. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly value?: Operation[]; + /** + * URL to get the next set of operation list results if there are any. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly nextLink?: string; +} + +/** A Billing REST API operation. */ +export interface Operation { + /** + * Operation name: {provider}/{resource}/{operation}. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly name?: string; + /** + * Identifies if the operation is a data operation. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly isDataAction?: boolean; + /** The object that represents the operation. */ + display?: OperationDisplay; +} + +/** The object that represents the operation. */ +export interface OperationDisplay { + /** + * Service provider: Microsoft.Billing. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly provider?: string; + /** + * Resource on which the operation is performed such as invoice and billing subscription. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly resource?: string; + /** + * Operation type such as read, write and delete. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly operation?: string; + /** + * Description of operation. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly description?: string; +} + +/** Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message. */ +export interface OperationsErrorResponse { + /** The details of the error. */ + error?: OperationsErrorDetails; +} + +/** The details of the error. */ +export interface OperationsErrorDetails { + /** + * Error code. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly code?: string; + /** + * Error message indicating why the operation failed. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly message?: string; + /** + * The target of the particular error. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly target?: string; +} + /** The request parameters for creating a new billing profile. */ export interface BillingProfileCreationRequest { /** The name of the billing profile. */ @@ -1916,6 +1956,11 @@ export interface Agreement extends Resource { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly acceptanceMode?: AcceptanceMode; + /** + * The list of billing profiles associated with agreement and present only for specific agreements. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly billingProfileInfo?: BillingProfileInfo; /** * The date from which the agreement is effective. * NOTE: This property will not be serialized. It can only be populated by the server. @@ -2800,12 +2845,20 @@ export type Category = string; /** Known values of {@link AcceptanceMode} that the service accepts. */ export enum KnownAcceptanceMode { + /** Other */ + Other = "Other", /** ClickToAccept */ ClickToAccept = "ClickToAccept", /** ESignEmbedded */ ESignEmbedded = "ESignEmbedded", /** ESignOffline */ - ESignOffline = "ESignOffline" + ESignOffline = "ESignOffline", + /** PhysicalSign */ + PhysicalSign = "PhysicalSign", + /** Offline */ + Offline = "Offline", + /** Implicit */ + Implicit = "Implicit" } /** @@ -2813,9 +2866,13 @@ export enum KnownAcceptanceMode { * {@link KnownAcceptanceMode} can be used interchangeably with AcceptanceMode, * this enum contains the known values that the service supports. * ### Known values supported by the service + * **Other** \ * **ClickToAccept** \ * **ESignEmbedded** \ - * **ESignOffline** + * **ESignOffline** \ + * **PhysicalSign** \ + * **Offline** \ + * **Implicit** */ export type AcceptanceMode = string; @@ -2860,10 +2917,7 @@ export type BillingAccountsListInvoiceSectionsByCreateSubscriptionPermissionResp /** Optional parameters. */ export interface BillingAccountsListNextOptionalParams - extends coreClient.OperationOptions { - /** May be used to expand the soldTo, invoice sections and billing profiles. */ - expand?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type BillingAccountsListNextResponse = BillingAccountListResult; @@ -2951,10 +3005,7 @@ export type BillingProfilesCreateOrUpdateResponse = BillingProfile; /** Optional parameters. */ export interface BillingProfilesListByBillingAccountNextOptionalParams - extends coreClient.OperationOptions { - /** May be used to expand the invoice sections. */ - expand?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listByBillingAccountNext operation. */ export type BillingProfilesListByBillingAccountNextResponse = BillingProfileListResult; @@ -2995,24 +3046,14 @@ export type CustomersGetResponse = Customer; /** Optional parameters. */ export interface CustomersListByBillingProfileNextOptionalParams - extends coreClient.OperationOptions { - /** Used for searching customers by their name. Any customer with name containing the search text will be included in the response */ - search?: string; - /** May be used to filter the list of customers. */ - filter?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listByBillingProfileNext operation. */ export type CustomersListByBillingProfileNextResponse = CustomerListResult; /** Optional parameters. */ export interface CustomersListByBillingAccountNextOptionalParams - extends coreClient.OperationOptions { - /** Used for searching customers by their name. Any customer with name containing the search text will be included in the response */ - search?: string; - /** May be used to filter the list of customers. */ - filter?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listByBillingAccountNext operation. */ export type CustomersListByBillingAccountNextResponse = CustomerListResult; @@ -3269,30 +3310,21 @@ export type ProductsListByCustomerNextResponse = ProductsListResult; /** Optional parameters. */ export interface ProductsListByBillingAccountNextOptionalParams - extends coreClient.OperationOptions { - /** May be used to filter by product type. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value are separated by a colon (:). */ - filter?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listByBillingAccountNext operation. */ export type ProductsListByBillingAccountNextResponse = ProductsListResult; /** Optional parameters. */ export interface ProductsListByBillingProfileNextOptionalParams - extends coreClient.OperationOptions { - /** May be used to filter by product type. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value are separated by a colon (:). */ - filter?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listByBillingProfileNext operation. */ export type ProductsListByBillingProfileNextResponse = ProductsListResult; /** Optional parameters. */ export interface ProductsListByInvoiceSectionNextOptionalParams - extends coreClient.OperationOptions { - /** May be used to filter by product type. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value are separated by a colon (:). */ - filter?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listByInvoiceSectionNext operation. */ export type ProductsListByInvoiceSectionNextResponse = ProductsListResult; @@ -3464,20 +3496,6 @@ export interface BillingPropertyUpdateOptionalParams /** Contains response data for the update operation. */ export type BillingPropertyUpdateResponse = BillingProperty; -/** Optional parameters. */ -export interface OperationsListOptionalParams - extends coreClient.OperationOptions {} - -/** Contains response data for the list operation. */ -export type OperationsListResponse = OperationListResult; - -/** Optional parameters. */ -export interface OperationsListNextOptionalParams - extends coreClient.OperationOptions {} - -/** Contains response data for the listNext operation. */ -export type OperationsListNextResponse = OperationListResult; - /** Optional parameters. */ export interface BillingRoleDefinitionsGetByBillingAccountOptionalParams extends coreClient.OperationOptions {} @@ -3647,10 +3665,7 @@ export type AgreementsGetResponse = Agreement; /** Optional parameters. */ export interface AgreementsListByBillingAccountNextOptionalParams - extends coreClient.OperationOptions { - /** May be used to expand the participants. */ - expand?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listByBillingAccountNext operation. */ export type AgreementsListByBillingAccountNextResponse = AgreementListResult; @@ -3689,32 +3704,14 @@ export type ReservationsListByBillingProfileResponse = ReservationsListResult; /** Optional parameters. */ export interface ReservationsListByBillingAccountNextOptionalParams - extends coreClient.OperationOptions { - /** May be used to filter by reservation properties. The filter supports 'eq', 'or', and 'and'. It does not currently support 'ne', 'gt', 'le', 'ge', or 'not'. */ - filter?: string; - /** May be used to sort order by reservation properties. */ - orderby?: string; - /** To indicate whether to refresh the roll up counts of the reservations group by provisioning states */ - refreshSummary?: string; - /** The selected provisioning state */ - selectedState?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listByBillingAccountNext operation. */ export type ReservationsListByBillingAccountNextResponse = ReservationsListResult; /** Optional parameters. */ export interface ReservationsListByBillingProfileNextOptionalParams - extends coreClient.OperationOptions { - /** May be used to filter by reservation properties. The filter supports 'eq', 'or', and 'and'. It does not currently support 'ne', 'gt', 'le', 'ge', or 'not'. */ - filter?: string; - /** May be used to sort order by reservation properties. */ - orderby?: string; - /** To indicate whether to refresh the roll up counts of the reservations group by provisioning state */ - refreshSummary?: string; - /** The selected provisioning state */ - selectedState?: string; -} + extends coreClient.OperationOptions {} /** Contains response data for the listByBillingProfileNext operation. */ export type ReservationsListByBillingProfileNextResponse = ReservationsListResult; @@ -3763,18 +3760,25 @@ export type BillingPeriodsGetResponse = BillingPeriod; /** Optional parameters. */ export interface BillingPeriodsListNextOptionalParams - extends coreClient.OperationOptions { - /** May be used to filter billing periods by billingPeriodEndDate. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. */ - filter?: string; - /** Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. */ - skiptoken?: string; - /** May be used to limit the number of results to the most recent N billing periods. */ - top?: number; -} + extends coreClient.OperationOptions {} /** Contains response data for the listNext operation. */ export type BillingPeriodsListNextResponse = BillingPeriodsListResult; +/** Optional parameters. */ +export interface OperationsListOptionalParams + extends coreClient.OperationOptions {} + +/** Contains response data for the list operation. */ +export type OperationsListResponse = OperationListResult; + +/** Optional parameters. */ +export interface OperationsListNextOptionalParams + extends coreClient.OperationOptions {} + +/** Contains response data for the listNext operation. */ +export type OperationsListNextResponse = OperationListResult; + /** Optional parameters. */ export interface BillingManagementClientOptionalParams extends coreClient.ServiceClientOptions { diff --git a/sdk/billing/arm-billing/src/models/mappers.ts b/sdk/billing/arm-billing/src/models/mappers.ts index cab4b62c81e0..dea3bf046a0a 100644 --- a/sdk/billing/arm-billing/src/models/mappers.ts +++ b/sdk/billing/arm-billing/src/models/mappers.ts @@ -771,6 +771,13 @@ export const BillingProfileListResult: coreClient.CompositeMapper = { } } }, + totalCount: { + serializedName: "totalCount", + readOnly: true, + type: { + name: "Number" + } + }, nextLink: { serializedName: "nextLink", readOnly: true, @@ -1341,10 +1348,10 @@ export const TransactionListResult: coreClient.CompositeMapper = { } }; -export const OperationListResult: coreClient.CompositeMapper = { +export const BillingRoleDefinitionListResult: coreClient.CompositeMapper = { type: { name: "Composite", - className: "OperationListResult", + className: "BillingRoleDefinitionListResult", modelProperties: { value: { serializedName: "value", @@ -1354,7 +1361,7 @@ export const OperationListResult: coreClient.CompositeMapper = { element: { type: { name: "Composite", - className: "Operation" + className: "BillingRoleDefinition" } } } @@ -1370,77 +1377,10 @@ export const OperationListResult: coreClient.CompositeMapper = { } }; -export const Operation: coreClient.CompositeMapper = { - type: { - name: "Composite", - className: "Operation", - modelProperties: { - name: { - serializedName: "name", - readOnly: true, - type: { - name: "String" - } - }, - isDataAction: { - serializedName: "isDataAction", - readOnly: true, - type: { - name: "Boolean" - } - }, - display: { - serializedName: "display", - type: { - name: "Composite", - className: "OperationDisplay" - } - } - } - } -}; - -export const OperationDisplay: coreClient.CompositeMapper = { - type: { - name: "Composite", - className: "OperationDisplay", - modelProperties: { - provider: { - serializedName: "provider", - readOnly: true, - type: { - name: "String" - } - }, - resource: { - serializedName: "resource", - readOnly: true, - type: { - name: "String" - } - }, - operation: { - serializedName: "operation", - readOnly: true, - type: { - name: "String" - } - }, - description: { - serializedName: "description", - readOnly: true, - type: { - name: "String" - } - } - } - } -}; - -export const BillingRoleDefinitionListResult: coreClient.CompositeMapper = { +export const BillingRoleAssignmentListResult: coreClient.CompositeMapper = { type: { name: "Composite", - className: "BillingRoleDefinitionListResult", + className: "BillingRoleAssignmentListResult", modelProperties: { value: { serializedName: "value", @@ -1450,7 +1390,7 @@ export const BillingRoleDefinitionListResult: coreClient.CompositeMapper = { element: { type: { name: "Composite", - className: "BillingRoleDefinition" + className: "BillingRoleAssignment" } } } @@ -1466,10 +1406,10 @@ export const BillingRoleDefinitionListResult: coreClient.CompositeMapper = { } }; -export const BillingRoleAssignmentListResult: coreClient.CompositeMapper = { +export const AgreementListResult: coreClient.CompositeMapper = { type: { name: "Composite", - className: "BillingRoleAssignmentListResult", + className: "AgreementListResult", modelProperties: { value: { serializedName: "value", @@ -1479,7 +1419,7 @@ export const BillingRoleAssignmentListResult: coreClient.CompositeMapper = { element: { type: { name: "Composite", - className: "BillingRoleAssignment" + className: "Agreement" } } } @@ -1495,27 +1435,25 @@ export const BillingRoleAssignmentListResult: coreClient.CompositeMapper = { } }; -export const AgreementListResult: coreClient.CompositeMapper = { +export const BillingProfileInfo: coreClient.CompositeMapper = { type: { name: "Composite", - className: "AgreementListResult", + className: "BillingProfileInfo", modelProperties: { - value: { - serializedName: "value", - readOnly: true, + billingProfileId: { + serializedName: "billingProfileId", type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "Agreement" - } - } + name: "String" } }, - nextLink: { - serializedName: "nextLink", - readOnly: true, + billingProfileDisplayName: { + serializedName: "billingProfileDisplayName", + type: { + name: "String" + } + }, + indirectRelationshipOrganizationName: { + serializedName: "indirectRelationshipOrganizationName", type: { name: "String" } @@ -1947,6 +1885,148 @@ export const BillingPeriodsListResult: coreClient.CompositeMapper = { } }; +export const OperationListResult: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "OperationListResult", + modelProperties: { + value: { + serializedName: "value", + readOnly: true, + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "Operation" + } + } + } + }, + nextLink: { + serializedName: "nextLink", + readOnly: true, + type: { + name: "String" + } + } + } + } +}; + +export const Operation: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "Operation", + modelProperties: { + name: { + serializedName: "name", + readOnly: true, + type: { + name: "String" + } + }, + isDataAction: { + serializedName: "isDataAction", + readOnly: true, + type: { + name: "Boolean" + } + }, + display: { + serializedName: "display", + type: { + name: "Composite", + className: "OperationDisplay" + } + } + } + } +}; + +export const OperationDisplay: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "OperationDisplay", + modelProperties: { + provider: { + serializedName: "provider", + readOnly: true, + type: { + name: "String" + } + }, + resource: { + serializedName: "resource", + readOnly: true, + type: { + name: "String" + } + }, + operation: { + serializedName: "operation", + readOnly: true, + type: { + name: "String" + } + }, + description: { + serializedName: "description", + readOnly: true, + type: { + name: "String" + } + } + } + } +}; + +export const OperationsErrorResponse: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "OperationsErrorResponse", + modelProperties: { + error: { + serializedName: "error", + type: { + name: "Composite", + className: "OperationsErrorDetails" + } + } + } + } +}; + +export const OperationsErrorDetails: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "OperationsErrorDetails", + modelProperties: { + code: { + serializedName: "code", + readOnly: true, + type: { + name: "String" + } + }, + message: { + serializedName: "message", + readOnly: true, + type: { + name: "String" + } + }, + target: { + serializedName: "target", + readOnly: true, + type: { + name: "String" + } + } + } + } +}; + export const BillingProfileCreationRequest: coreClient.CompositeMapper = { type: { name: "Composite", @@ -3580,6 +3660,13 @@ export const Agreement: coreClient.CompositeMapper = { name: "String" } }, + billingProfileInfo: { + serializedName: "properties.billingProfileInfo", + type: { + name: "Composite", + className: "BillingProfileInfo" + } + }, effectiveDate: { serializedName: "properties.effectiveDate", readOnly: true, diff --git a/sdk/billing/arm-billing/src/operations/agreements.ts b/sdk/billing/arm-billing/src/operations/agreements.ts index 7b4443a749fa..3c489c1bdf78 100644 --- a/sdk/billing/arm-billing/src/operations/agreements.ts +++ b/sdk/billing/arm-billing/src/operations/agreements.ts @@ -209,7 +209,6 @@ const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.expand], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/billingAccounts.ts b/sdk/billing/arm-billing/src/operations/billingAccounts.ts index 8f4a47b5a879..8f1d21d6d639 100644 --- a/sdk/billing/arm-billing/src/operations/billingAccounts.ts +++ b/sdk/billing/arm-billing/src/operations/billingAccounts.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { BillingManagementClient } from "../billingManagementClient"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { BillingAccount, BillingAccountsListNextOptionalParams, @@ -213,8 +217,8 @@ export class BillingAccountsImpl implements BillingAccounts { parameters: BillingAccountUpdateRequest, options?: BillingAccountsUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BillingAccountsUpdateResponse > > { @@ -224,7 +228,7 @@ export class BillingAccountsImpl implements BillingAccounts { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -257,15 +261,18 @@ export class BillingAccountsImpl implements BillingAccounts { }; }; - const lro = new LroImpl( - sendOperation, - { billingAccountName, parameters, options }, - updateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { billingAccountName, parameters, options }, + spec: updateOperationSpec + }); + const poller = await createHttpPoller< + BillingAccountsUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs, - lroResourceLocationConfig: "azure-async-operation" + resourceLocationConfig: "azure-async-operation" }); await poller.poll(); return poller; @@ -434,7 +441,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.expand], urlParameters: [Parameters.$host, Parameters.nextLink], headerParameters: [Parameters.accept], serializer @@ -450,7 +456,6 @@ const listInvoiceSectionsByCreateSubscriptionPermissionNextOperationSpec: coreCl bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/billingPeriods.ts b/sdk/billing/arm-billing/src/operations/billingPeriods.ts index 41ee629f89fb..6c80ac12d08e 100644 --- a/sdk/billing/arm-billing/src/operations/billingPeriods.ts +++ b/sdk/billing/arm-billing/src/operations/billingPeriods.ts @@ -193,12 +193,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.filter, - Parameters.apiVersion1, - Parameters.skiptoken, - Parameters.top - ], urlParameters: [ Parameters.$host, Parameters.nextLink, diff --git a/sdk/billing/arm-billing/src/operations/billingPermissions.ts b/sdk/billing/arm-billing/src/operations/billingPermissions.ts index c7aa3ff80765..5ab45843dc70 100644 --- a/sdk/billing/arm-billing/src/operations/billingPermissions.ts +++ b/sdk/billing/arm-billing/src/operations/billingPermissions.ts @@ -624,7 +624,6 @@ const listByCustomerNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -645,7 +644,6 @@ const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -665,7 +663,6 @@ const listByInvoiceSectionsNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -687,7 +684,6 @@ const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/billingProfiles.ts b/sdk/billing/arm-billing/src/operations/billingProfiles.ts index 5d5beba5344c..9951d954c788 100644 --- a/sdk/billing/arm-billing/src/operations/billingProfiles.ts +++ b/sdk/billing/arm-billing/src/operations/billingProfiles.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { BillingManagementClient } from "../billingManagementClient"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { BillingProfile, BillingProfilesListByBillingAccountNextOptionalParams, @@ -161,8 +165,8 @@ export class BillingProfilesImpl implements BillingProfiles { parameters: BillingProfile, options?: BillingProfilesCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BillingProfilesCreateOrUpdateResponse > > { @@ -172,7 +176,7 @@ export class BillingProfilesImpl implements BillingProfiles { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -205,13 +209,16 @@ export class BillingProfilesImpl implements BillingProfiles { }; }; - const lro = new LroImpl( - sendOperation, - { billingAccountName, billingProfileName, parameters, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { billingAccountName, billingProfileName, parameters, options }, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + BillingProfilesCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -342,7 +349,6 @@ const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.expand], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/billingRoleAssignments.ts b/sdk/billing/arm-billing/src/operations/billingRoleAssignments.ts index b5cf79062a6d..c8480c8d8bd1 100644 --- a/sdk/billing/arm-billing/src/operations/billingRoleAssignments.ts +++ b/sdk/billing/arm-billing/src/operations/billingRoleAssignments.ts @@ -771,7 +771,6 @@ const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -791,7 +790,6 @@ const listByInvoiceSectionNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -813,7 +811,6 @@ const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/billingRoleDefinitions.ts b/sdk/billing/arm-billing/src/operations/billingRoleDefinitions.ts index 2bcc5be2b54c..f0560052cc78 100644 --- a/sdk/billing/arm-billing/src/operations/billingRoleDefinitions.ts +++ b/sdk/billing/arm-billing/src/operations/billingRoleDefinitions.ts @@ -628,7 +628,6 @@ const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -648,7 +647,6 @@ const listByInvoiceSectionNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -670,7 +668,6 @@ const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/billingSubscriptions.ts b/sdk/billing/arm-billing/src/operations/billingSubscriptions.ts index 024be26ef296..a4f1dae9f08b 100644 --- a/sdk/billing/arm-billing/src/operations/billingSubscriptions.ts +++ b/sdk/billing/arm-billing/src/operations/billingSubscriptions.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { BillingManagementClient } from "../billingManagementClient"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { BillingSubscription, BillingSubscriptionsListByCustomerNextOptionalParams, @@ -513,8 +517,8 @@ export class BillingSubscriptionsImpl implements BillingSubscriptions { parameters: TransferBillingSubscriptionRequestProperties, options?: BillingSubscriptionsMoveOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BillingSubscriptionsMoveResponse > > { @@ -524,7 +528,7 @@ export class BillingSubscriptionsImpl implements BillingSubscriptions { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -557,13 +561,16 @@ export class BillingSubscriptionsImpl implements BillingSubscriptions { }; }; - const lro = new LroImpl( - sendOperation, - { billingAccountName, parameters, options }, - moveOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { billingAccountName, parameters, options }, + spec: moveOperationSpec + }); + const poller = await createHttpPoller< + BillingSubscriptionsMoveResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -885,7 +892,6 @@ const listByCustomerNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -906,7 +912,6 @@ const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -926,7 +931,6 @@ const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -947,7 +951,6 @@ const listByInvoiceSectionNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/customers.ts b/sdk/billing/arm-billing/src/operations/customers.ts index 6ae9f60bbc8e..a8879c431b68 100644 --- a/sdk/billing/arm-billing/src/operations/customers.ts +++ b/sdk/billing/arm-billing/src/operations/customers.ts @@ -367,11 +367,6 @@ const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.search, - Parameters.filter - ], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -392,11 +387,6 @@ const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.search, - Parameters.filter - ], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/enrollmentAccounts.ts b/sdk/billing/arm-billing/src/operations/enrollmentAccounts.ts index 0c35bccf7dd1..64af975fa3aa 100644 --- a/sdk/billing/arm-billing/src/operations/enrollmentAccounts.ts +++ b/sdk/billing/arm-billing/src/operations/enrollmentAccounts.ts @@ -176,7 +176,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion1], urlParameters: [Parameters.$host, Parameters.nextLink], headerParameters: [Parameters.accept], serializer diff --git a/sdk/billing/arm-billing/src/operations/index.ts b/sdk/billing/arm-billing/src/operations/index.ts index 44525347c3ce..4783a6a428be 100644 --- a/sdk/billing/arm-billing/src/operations/index.ts +++ b/sdk/billing/arm-billing/src/operations/index.ts @@ -20,10 +20,10 @@ export * from "./invoices"; export * from "./transactions"; export * from "./policies"; export * from "./billingPropertyOperations"; -export * from "./operations"; export * from "./billingRoleDefinitions"; export * from "./billingRoleAssignments"; export * from "./agreements"; export * from "./reservations"; export * from "./enrollmentAccounts"; export * from "./billingPeriods"; +export * from "./operations"; diff --git a/sdk/billing/arm-billing/src/operations/instructions.ts b/sdk/billing/arm-billing/src/operations/instructions.ts index 14a7250b6033..655e3253ae6d 100644 --- a/sdk/billing/arm-billing/src/operations/instructions.ts +++ b/sdk/billing/arm-billing/src/operations/instructions.ts @@ -287,7 +287,6 @@ const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/invoiceSections.ts b/sdk/billing/arm-billing/src/operations/invoiceSections.ts index 9e456ef6b7c4..162af4e7ea08 100644 --- a/sdk/billing/arm-billing/src/operations/invoiceSections.ts +++ b/sdk/billing/arm-billing/src/operations/invoiceSections.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { BillingManagementClient } from "../billingManagementClient"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { InvoiceSection, InvoiceSectionsListByBillingProfileNextOptionalParams, @@ -179,8 +183,8 @@ export class InvoiceSectionsImpl implements InvoiceSections { parameters: InvoiceSection, options?: InvoiceSectionsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, InvoiceSectionsCreateOrUpdateResponse > > { @@ -190,7 +194,7 @@ export class InvoiceSectionsImpl implements InvoiceSections { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -223,19 +227,22 @@ export class InvoiceSectionsImpl implements InvoiceSections { }; }; - const lro = new LroImpl( - sendOperation, - { + const lro = createLroSpec({ + sendOperationFn, + args: { billingAccountName, billingProfileName, invoiceSectionName, parameters, options }, - createOrUpdateOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + spec: createOrUpdateOperationSpec + }); + const poller = await createHttpPoller< + InvoiceSectionsCreateOrUpdateResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); await poller.poll(); @@ -377,7 +384,6 @@ const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/invoices.ts b/sdk/billing/arm-billing/src/operations/invoices.ts index fb31072c2091..1d8520d88a33 100644 --- a/sdk/billing/arm-billing/src/operations/invoices.ts +++ b/sdk/billing/arm-billing/src/operations/invoices.ts @@ -13,8 +13,12 @@ import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; import * as Parameters from "../models/parameters"; import { BillingManagementClient } from "../billingManagementClient"; -import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; -import { LroImpl } from "../lroImpl"; +import { + SimplePollerLike, + OperationState, + createHttpPoller +} from "@azure/core-lro"; +import { createLroSpec } from "../lroImpl"; import { Invoice, InvoicesListByBillingAccountNextOptionalParams, @@ -127,8 +131,6 @@ export class InvoicesImpl implements Invoices { while (continuationToken) { result = await this._listByBillingAccountNext( billingAccountName, - periodStartDate, - periodEndDate, continuationToken, options ); @@ -231,8 +233,6 @@ export class InvoicesImpl implements Invoices { result = await this._listByBillingProfileNext( billingAccountName, billingProfileName, - periodStartDate, - periodEndDate, continuationToken, options ); @@ -319,8 +319,6 @@ export class InvoicesImpl implements Invoices { } while (continuationToken) { result = await this._listByBillingSubscriptionNext( - periodStartDate, - periodEndDate, continuationToken, options ); @@ -447,8 +445,8 @@ export class InvoicesImpl implements Invoices { downloadToken: string, options?: InvoicesDownloadInvoiceOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, InvoicesDownloadInvoiceResponse > > { @@ -458,7 +456,7 @@ export class InvoicesImpl implements Invoices { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -491,15 +489,18 @@ export class InvoicesImpl implements Invoices { }; }; - const lro = new LroImpl( - sendOperation, - { billingAccountName, invoiceName, downloadToken, options }, - downloadInvoiceOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { billingAccountName, invoiceName, downloadToken, options }, + spec: downloadInvoiceOperationSpec + }); + const poller = await createHttpPoller< + InvoicesDownloadInvoiceResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs, - lroResourceLocationConfig: "location" + resourceLocationConfig: "location" }); await poller.poll(); return poller; @@ -541,10 +542,8 @@ export class InvoicesImpl implements Invoices { downloadUrls: string[], options?: InvoicesDownloadMultipleBillingProfileInvoicesOptionalParams ): Promise< - PollerLike< - PollOperationState< - InvoicesDownloadMultipleBillingProfileInvoicesResponse - >, + SimplePollerLike< + OperationState, InvoicesDownloadMultipleBillingProfileInvoicesResponse > > { @@ -554,7 +553,7 @@ export class InvoicesImpl implements Invoices { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -587,15 +586,18 @@ export class InvoicesImpl implements Invoices { }; }; - const lro = new LroImpl( - sendOperation, - { billingAccountName, downloadUrls, options }, - downloadMultipleBillingProfileInvoicesOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { billingAccountName, downloadUrls, options }, + spec: downloadMultipleBillingProfileInvoicesOperationSpec + }); + const poller = await createHttpPoller< + InvoicesDownloadMultipleBillingProfileInvoicesResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs, - lroResourceLocationConfig: "location" + resourceLocationConfig: "location" }); await poller.poll(); return poller; @@ -665,8 +667,8 @@ export class InvoicesImpl implements Invoices { downloadToken: string, options?: InvoicesDownloadBillingSubscriptionInvoiceOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, InvoicesDownloadBillingSubscriptionInvoiceResponse > > { @@ -676,7 +678,7 @@ export class InvoicesImpl implements Invoices { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -709,15 +711,18 @@ export class InvoicesImpl implements Invoices { }; }; - const lro = new LroImpl( - sendOperation, - { invoiceName, downloadToken, options }, - downloadBillingSubscriptionInvoiceOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { invoiceName, downloadToken, options }, + spec: downloadBillingSubscriptionInvoiceOperationSpec + }); + const poller = await createHttpPoller< + InvoicesDownloadBillingSubscriptionInvoiceResponse, + OperationState + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs, - lroResourceLocationConfig: "location" + resourceLocationConfig: "location" }); await poller.poll(); return poller; @@ -752,8 +757,8 @@ export class InvoicesImpl implements Invoices { downloadUrls: string[], options?: InvoicesDownloadMultipleBillingSubscriptionInvoicesOptionalParams ): Promise< - PollerLike< - PollOperationState< + SimplePollerLike< + OperationState< InvoicesDownloadMultipleBillingSubscriptionInvoicesResponse >, InvoicesDownloadMultipleBillingSubscriptionInvoicesResponse @@ -765,7 +770,7 @@ export class InvoicesImpl implements Invoices { ): Promise => { return this.client.sendOperationRequest(args, spec); }; - const sendOperation = async ( + const sendOperationFn = async ( args: coreClient.OperationArguments, spec: coreClient.OperationSpec ) => { @@ -798,15 +803,20 @@ export class InvoicesImpl implements Invoices { }; }; - const lro = new LroImpl( - sendOperation, - { downloadUrls, options }, - downloadMultipleBillingSubscriptionInvoicesOperationSpec - ); - const poller = new LroEngine(lro, { - resumeFrom: options?.resumeFrom, + const lro = createLroSpec({ + sendOperationFn, + args: { downloadUrls, options }, + spec: downloadMultipleBillingSubscriptionInvoicesOperationSpec + }); + const poller = await createHttpPoller< + InvoicesDownloadMultipleBillingSubscriptionInvoicesResponse, + OperationState< + InvoicesDownloadMultipleBillingSubscriptionInvoicesResponse + > + >(lro, { + restoreFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs, - lroResourceLocationConfig: "location" + resourceLocationConfig: "location" }); await poller.poll(); return poller; @@ -832,22 +842,16 @@ export class InvoicesImpl implements Invoices { /** * ListByBillingAccountNext * @param billingAccountName The ID that uniquely identifies a billing account. - * @param periodStartDate The start date to fetch the invoices. The date should be specified in - * MM-DD-YYYY format. - * @param periodEndDate The end date to fetch the invoices. The date should be specified in MM-DD-YYYY - * format. * @param nextLink The nextLink from the previous successful call to the ListByBillingAccount method. * @param options The options parameters. */ private _listByBillingAccountNext( billingAccountName: string, - periodStartDate: string, - periodEndDate: string, nextLink: string, options?: InvoicesListByBillingAccountNextOptionalParams ): Promise { return this.client.sendOperationRequest( - { billingAccountName, periodStartDate, periodEndDate, nextLink, options }, + { billingAccountName, nextLink, options }, listByBillingAccountNextOperationSpec ); } @@ -856,50 +860,33 @@ export class InvoicesImpl implements Invoices { * ListByBillingProfileNext * @param billingAccountName The ID that uniquely identifies a billing account. * @param billingProfileName The ID that uniquely identifies a billing profile. - * @param periodStartDate The start date to fetch the invoices. The date should be specified in - * MM-DD-YYYY format. - * @param periodEndDate The end date to fetch the invoices. The date should be specified in MM-DD-YYYY - * format. * @param nextLink The nextLink from the previous successful call to the ListByBillingProfile method. * @param options The options parameters. */ private _listByBillingProfileNext( billingAccountName: string, billingProfileName: string, - periodStartDate: string, - periodEndDate: string, nextLink: string, options?: InvoicesListByBillingProfileNextOptionalParams ): Promise { return this.client.sendOperationRequest( - { - billingAccountName, - billingProfileName, - periodStartDate, - periodEndDate, - nextLink, - options - }, + { billingAccountName, billingProfileName, nextLink, options }, listByBillingProfileNextOperationSpec ); } /** * ListByBillingSubscriptionNext - * @param periodStartDate Invoice period start date. - * @param periodEndDate Invoice period end date. * @param nextLink The nextLink from the previous successful call to the ListByBillingSubscription * method. * @param options The options parameters. */ private _listByBillingSubscriptionNext( - periodStartDate: string, - periodEndDate: string, nextLink: string, options?: InvoicesListByBillingSubscriptionNextOptionalParams ): Promise { return this.client.sendOperationRequest( - { periodStartDate, periodEndDate, nextLink, options }, + { nextLink, options }, listByBillingSubscriptionNextOperationSpec ); } @@ -1160,11 +1147,6 @@ const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.periodStartDate, - Parameters.periodEndDate - ], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -1184,11 +1166,6 @@ const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.periodStartDate, - Parameters.periodEndDate - ], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -1209,11 +1186,6 @@ const listByBillingSubscriptionNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.periodStartDate, - Parameters.periodEndDate - ], urlParameters: [ Parameters.$host, Parameters.nextLink, diff --git a/sdk/billing/arm-billing/src/operations/operations.ts b/sdk/billing/arm-billing/src/operations/operations.ts index 65ac1c045528..7333948b6a36 100644 --- a/sdk/billing/arm-billing/src/operations/operations.ts +++ b/sdk/billing/arm-billing/src/operations/operations.ts @@ -124,7 +124,7 @@ const listOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.OperationListResult }, default: { - bodyMapper: Mappers.ErrorResponse + bodyMapper: Mappers.OperationsErrorResponse } }, queryParameters: [Parameters.apiVersion], @@ -140,10 +140,9 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.OperationListResult }, default: { - bodyMapper: Mappers.ErrorResponse + bodyMapper: Mappers.OperationsErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [Parameters.$host, Parameters.nextLink], headerParameters: [Parameters.accept], serializer diff --git a/sdk/billing/arm-billing/src/operations/products.ts b/sdk/billing/arm-billing/src/operations/products.ts index c53166ad8f51..acd091c8b788 100644 --- a/sdk/billing/arm-billing/src/operations/products.ts +++ b/sdk/billing/arm-billing/src/operations/products.ts @@ -819,7 +819,6 @@ const listByCustomerNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -840,7 +839,6 @@ const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.filter], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -860,7 +858,6 @@ const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.filter], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -881,7 +878,6 @@ const listByInvoiceSectionNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion, Parameters.filter], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/reservations.ts b/sdk/billing/arm-billing/src/operations/reservations.ts index 6620ead12a0f..da0be4186c95 100644 --- a/sdk/billing/arm-billing/src/operations/reservations.ts +++ b/sdk/billing/arm-billing/src/operations/reservations.ts @@ -330,13 +330,6 @@ const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.filter, - Parameters.orderby, - Parameters.refreshSummary, - Parameters.selectedState - ], urlParameters: [ Parameters.$host, Parameters.billingAccountName, @@ -356,13 +349,6 @@ const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [ - Parameters.apiVersion, - Parameters.filter, - Parameters.orderby, - Parameters.refreshSummary, - Parameters.selectedState - ], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operations/transactions.ts b/sdk/billing/arm-billing/src/operations/transactions.ts index e5ee25229ff7..7be9b2e7214f 100644 --- a/sdk/billing/arm-billing/src/operations/transactions.ts +++ b/sdk/billing/arm-billing/src/operations/transactions.ts @@ -191,7 +191,6 @@ const listByInvoiceNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.billingAccountName, diff --git a/sdk/billing/arm-billing/src/operationsInterfaces/billingAccounts.ts b/sdk/billing/arm-billing/src/operationsInterfaces/billingAccounts.ts index 3b4b3e3664a6..e5061cfdf58c 100644 --- a/sdk/billing/arm-billing/src/operationsInterfaces/billingAccounts.ts +++ b/sdk/billing/arm-billing/src/operationsInterfaces/billingAccounts.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { BillingAccount, BillingAccountsListOptionalParams, @@ -61,8 +61,8 @@ export interface BillingAccounts { parameters: BillingAccountUpdateRequest, options?: BillingAccountsUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BillingAccountsUpdateResponse > >; diff --git a/sdk/billing/arm-billing/src/operationsInterfaces/billingProfiles.ts b/sdk/billing/arm-billing/src/operationsInterfaces/billingProfiles.ts index 3f8dc7cef720..a33a4bc074f5 100644 --- a/sdk/billing/arm-billing/src/operationsInterfaces/billingProfiles.ts +++ b/sdk/billing/arm-billing/src/operationsInterfaces/billingProfiles.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { BillingProfile, BillingProfilesListByBillingAccountOptionalParams, @@ -56,8 +56,8 @@ export interface BillingProfiles { parameters: BillingProfile, options?: BillingProfilesCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BillingProfilesCreateOrUpdateResponse > >; diff --git a/sdk/billing/arm-billing/src/operationsInterfaces/billingSubscriptions.ts b/sdk/billing/arm-billing/src/operationsInterfaces/billingSubscriptions.ts index db9556f0ac3e..aaad091f0dcf 100644 --- a/sdk/billing/arm-billing/src/operationsInterfaces/billingSubscriptions.ts +++ b/sdk/billing/arm-billing/src/operationsInterfaces/billingSubscriptions.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { BillingSubscription, BillingSubscriptionsListByCustomerOptionalParams, @@ -111,8 +111,8 @@ export interface BillingSubscriptions { parameters: TransferBillingSubscriptionRequestProperties, options?: BillingSubscriptionsMoveOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, BillingSubscriptionsMoveResponse > >; diff --git a/sdk/billing/arm-billing/src/operationsInterfaces/index.ts b/sdk/billing/arm-billing/src/operationsInterfaces/index.ts index 44525347c3ce..4783a6a428be 100644 --- a/sdk/billing/arm-billing/src/operationsInterfaces/index.ts +++ b/sdk/billing/arm-billing/src/operationsInterfaces/index.ts @@ -20,10 +20,10 @@ export * from "./invoices"; export * from "./transactions"; export * from "./policies"; export * from "./billingPropertyOperations"; -export * from "./operations"; export * from "./billingRoleDefinitions"; export * from "./billingRoleAssignments"; export * from "./agreements"; export * from "./reservations"; export * from "./enrollmentAccounts"; export * from "./billingPeriods"; +export * from "./operations"; diff --git a/sdk/billing/arm-billing/src/operationsInterfaces/invoiceSections.ts b/sdk/billing/arm-billing/src/operationsInterfaces/invoiceSections.ts index 99ee83a06d19..c60bfbddeca5 100644 --- a/sdk/billing/arm-billing/src/operationsInterfaces/invoiceSections.ts +++ b/sdk/billing/arm-billing/src/operationsInterfaces/invoiceSections.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { InvoiceSection, InvoiceSectionsListByBillingProfileOptionalParams, @@ -62,8 +62,8 @@ export interface InvoiceSections { parameters: InvoiceSection, options?: InvoiceSectionsCreateOrUpdateOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, InvoiceSectionsCreateOrUpdateResponse > >; diff --git a/sdk/billing/arm-billing/src/operationsInterfaces/invoices.ts b/sdk/billing/arm-billing/src/operationsInterfaces/invoices.ts index 8aa605da3de5..74c9ece5101e 100644 --- a/sdk/billing/arm-billing/src/operationsInterfaces/invoices.ts +++ b/sdk/billing/arm-billing/src/operationsInterfaces/invoices.ts @@ -7,7 +7,7 @@ */ import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { PollerLike, PollOperationState } from "@azure/core-lro"; +import { SimplePollerLike, OperationState } from "@azure/core-lro"; import { Invoice, InvoicesListByBillingAccountOptionalParams, @@ -115,8 +115,8 @@ export interface Invoices { downloadToken: string, options?: InvoicesDownloadInvoiceOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, InvoicesDownloadInvoiceResponse > >; @@ -147,10 +147,8 @@ export interface Invoices { downloadUrls: string[], options?: InvoicesDownloadMultipleBillingProfileInvoicesOptionalParams ): Promise< - PollerLike< - PollOperationState< - InvoicesDownloadMultipleBillingProfileInvoicesResponse - >, + SimplePollerLike< + OperationState, InvoicesDownloadMultipleBillingProfileInvoicesResponse > >; @@ -187,8 +185,8 @@ export interface Invoices { downloadToken: string, options?: InvoicesDownloadBillingSubscriptionInvoiceOptionalParams ): Promise< - PollerLike< - PollOperationState, + SimplePollerLike< + OperationState, InvoicesDownloadBillingSubscriptionInvoiceResponse > >; @@ -213,8 +211,8 @@ export interface Invoices { downloadUrls: string[], options?: InvoicesDownloadMultipleBillingSubscriptionInvoicesOptionalParams ): Promise< - PollerLike< - PollOperationState< + SimplePollerLike< + OperationState< InvoicesDownloadMultipleBillingSubscriptionInvoicesResponse >, InvoicesDownloadMultipleBillingSubscriptionInvoicesResponse diff --git a/sdk/billing/arm-billing/src/pagingHelper.ts b/sdk/billing/arm-billing/src/pagingHelper.ts index d85fc13bce1e..269a2b9814b5 100644 --- a/sdk/billing/arm-billing/src/pagingHelper.ts +++ b/sdk/billing/arm-billing/src/pagingHelper.ts @@ -13,11 +13,11 @@ export interface PageInfo { const pageMap = new WeakMap(); /** - * Given a result page from a pageable operation, returns a - * continuation token that can be used to begin paging from + * Given the last `.value` produced by the `byPage` iterator, + * returns a continuation token that can be used to begin paging from * that point later. - * @param page A result object from calling .byPage() on a paged operation. - * @returns The continuation token that can be passed into byPage(). + * @param page An object from accessing `value` on the IteratorResult from a `byPage` iterator. + * @returns The continuation token that can be passed into byPage() during future calls. */ export function getContinuationToken(page: unknown): string | undefined { if (typeof page !== "object" || page === null) { diff --git a/sdk/billing/arm-billing/tsconfig.json b/sdk/billing/arm-billing/tsconfig.json index 9ae8a5150d1d..3e6ae96443f3 100644 --- a/sdk/billing/arm-billing/tsconfig.json +++ b/sdk/billing/arm-billing/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-billing": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"