From 4496a56e8452aba26dea50f3eddc5012c8eb518e Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 3 Mar 2022 10:45:20 +0000 Subject: [PATCH] CodeGen from PR 18082 in Azure/azure-rest-api-specs Merge 9b7783ce0ebfc952c95ae3d619d57652aa0dbb85 into d0b5e9937f89a600dd25c1aa450b42fe911e067d --- common/config/rush/pnpm-lock.yaml | 20 ++++---- sdk/search/arm-search/LICENSE | 2 +- sdk/search/arm-search/README.md | 2 +- sdk/search/arm-search/_meta.json | 6 +-- sdk/search/arm-search/api-extractor.json | 25 +++++++--- sdk/search/arm-search/package.json | 8 ++-- .../arm-search/src/searchManagementClient.ts | 2 +- sdk/search/arm-search/test/sampleTest.ts | 48 +++++++++++++++++++ sdk/search/arm-search/tsconfig.json | 16 +++++-- sdk/search/ci.mgmt.yml | 9 ++-- sdk/search/ci.yml | 5 +- 11 files changed, 108 insertions(+), 35 deletions(-) create mode 100644 sdk/search/arm-search/test/sampleTest.ts diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 39a37673e39c..cc625f19504e 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -9813,7 +9813,7 @@ packages: dev: false file:projects/arm-compute.tgz: - resolution: {integrity: sha512-okUIINibMfByOcF/XtlGLbDsZYz05n1qBM0dA/a+Eo5/KabGmUsCDe+/Ycn2GigMHSPojpuMLGsAnhRaCqe1Rw==, tarball: file:projects/arm-compute.tgz} + resolution: {integrity: sha512-SXG1OOPxmuDjfmHhCOcG31GII1K7GgOEgaWBJ1ljPTcUIHkI9dVHelhX9hgUh5GOlGLpQlC6UYp6PKlJE4JVXA==, tarball: file:projects/arm-compute.tgz} name: '@rush-temp/arm-compute' version: 0.0.0 dependencies: @@ -10790,7 +10790,7 @@ packages: dev: false file:projects/arm-imagebuilder.tgz: - resolution: {integrity: sha512-rIvsXQJShRtBz5RlLlvfoBOrrvb868mMeR8rLaiV16gm2S6qWYfsMXPdZ8NQ4fTvw3k5oiKZ5t/3XgcJfd2fZA==, tarball: file:projects/arm-imagebuilder.tgz} + resolution: {integrity: sha512-kyj4FpY8IBE52Ojym8PqCldNoyZMUgbMZDUTT7hn7Rd7WF3N843VdO2uiLxTz+CCpZfvC2WDGY+H+wiCQeCcHQ==, tarball: file:projects/arm-imagebuilder.tgz} name: '@rush-temp/arm-imagebuilder' version: 0.0.0 dependencies: @@ -12335,23 +12335,23 @@ packages: dev: false file:projects/arm-search.tgz: - resolution: {integrity: sha512-H3cy/iUbSsOVK8MDWSCxbgCO7g3JoE1IS6bqEM1Uqg3CslOWsgV1M+HJviOxQungD4JYHGW9kYYf7URWpMhXfg==, tarball: file:projects/arm-search.tgz} + resolution: {integrity: sha512-HApflbIp4qFJ/cQMT5ctDYp0cnHCaUyRtXEoQl5M9RxG/qrq27+rdar9Ek7F9yfmdP49Hlvb537u4D7u7U3YEg==, tarball: file:projects/arm-search.tgz} name: '@rush-temp/arm-search' version: 0.0.0 dependencies: '@azure-tools/test-recorder': 1.0.2 '@azure/identity': 2.0.4 '@microsoft/api-extractor': 7.19.4 - '@rollup/plugin-commonjs': 21.0.1_rollup@2.67.1 - '@rollup/plugin-json': 4.1.0_rollup@2.67.1 - '@rollup/plugin-multi-entry': 3.0.1_rollup@2.67.1 - '@rollup/plugin-node-resolve': 8.4.0_rollup@2.67.1 + '@rollup/plugin-commonjs': 11.0.2_rollup@1.32.1 + '@rollup/plugin-json': 4.1.0_rollup@1.32.1 + '@rollup/plugin-multi-entry': 3.0.1_rollup@1.32.1 + '@rollup/plugin-node-resolve': 8.4.0_rollup@1.32.1 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 rimraf: 3.0.2 - rollup: 2.67.1 - rollup-plugin-sourcemaps: 0.4.2_rollup@2.67.1 + rollup: 1.32.1 + rollup-plugin-sourcemaps: 0.4.2_rollup@1.32.1 tslib: 2.3.1 typescript: 4.2.4 uglify-js: 3.15.1 @@ -14463,7 +14463,7 @@ packages: dev: false file:projects/eslint-plugin-azure-sdk.tgz: - resolution: {integrity: sha512-b9jZ8mqW0mbkStNGNjwmVGtkT7iLTX59lFCOuKzl+KH/VvKLStoNCs19xf1HEXO2WrMLkzOj5c9K0WMXusvvmQ==, tarball: file:projects/eslint-plugin-azure-sdk.tgz} + resolution: {integrity: sha512-TbTRI/L8IaCaN0rhK1Emy5igUmmHz+tbrsvfWTVvwOW9h43KzUxrJf2QtCWgHmJtS9P8zQTlt/bumJz7kbeNBA==, tarball: file:projects/eslint-plugin-azure-sdk.tgz} name: '@rush-temp/eslint-plugin-azure-sdk' version: 0.0.0 dependencies: diff --git a/sdk/search/arm-search/LICENSE b/sdk/search/arm-search/LICENSE index ccb63b166732..5d1d36e0af80 100644 --- a/sdk/search/arm-search/LICENSE +++ b/sdk/search/arm-search/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2021 Microsoft +Copyright (c) 2022 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/search/arm-search/README.md b/sdk/search/arm-search/README.md index daf79dc4d1ae..6bd253aa2150 100644 --- a/sdk/search/arm-search/README.md +++ b/sdk/search/arm-search/README.md @@ -6,7 +6,7 @@ Client that can be used to manage Azure Cognitive Search services and API keys. [Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/search/arm-search) | [Package (NPM)](https://www.npmjs.com/package/@azure/arm-search) | -[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-search) | +[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-search?view=azure-node-preview) | [Samples](https://github.com/Azure-Samples/azure-samples-js-management) ## Getting started diff --git a/sdk/search/arm-search/_meta.json b/sdk/search/arm-search/_meta.json index 4ad5b4ae250f..5617c5c7d40f 100644 --- a/sdk/search/arm-search/_meta.json +++ b/sdk/search/arm-search/_meta.json @@ -1,7 +1,7 @@ { - "commit": "0cd7b3e83d5e7e21222dcc4bdde4565562da0cdf", + "commit": "a61ca93647a0a3fb0ee8a00c15f04586c93348ff", "readme": "specification/search/resource-manager/readme.md", - "autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/search/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20211217.1", + "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/search/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20220105.1", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "use": "@autorest/typescript@6.0.0-alpha.16.20211217.1" + "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1" } \ No newline at end of file diff --git a/sdk/search/arm-search/api-extractor.json b/sdk/search/arm-search/api-extractor.json index 92748b1fa190..b7e5608ce0ec 100644 --- a/sdk/search/arm-search/api-extractor.json +++ b/sdk/search/arm-search/api-extractor.json @@ -1,18 +1,31 @@ { "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", "mainEntryPointFilePath": "./dist-esm/src/index.d.ts", - "docModel": { "enabled": true }, - "apiReport": { "enabled": true, "reportFolder": "./review" }, + "docModel": { + "enabled": true + }, + "apiReport": { + "enabled": true, + "reportFolder": "./review" + }, "dtsRollup": { "enabled": true, "untrimmedFilePath": "", "publicTrimmedFilePath": "./types/arm-search.d.ts" }, "messages": { - "tsdocMessageReporting": { "default": { "logLevel": "none" } }, + "tsdocMessageReporting": { + "default": { + "logLevel": "none" + } + }, "extractorMessageReporting": { - "ae-missing-release-tag": { "logLevel": "none" }, - "ae-unresolved-link": { "logLevel": "none" } + "ae-missing-release-tag": { + "logLevel": "none" + }, + "ae-unresolved-link": { + "logLevel": "none" + } } } -} +} \ No newline at end of file diff --git a/sdk/search/arm-search/package.json b/sdk/search/arm-search/package.json index 6bc596ad7898..5c818a6bd468 100644 --- a/sdk/search/arm-search/package.json +++ b/sdk/search/arm-search/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for SearchManagementClient.", - "version": "3.0.1", + "version": "1.0.0-beta.1", "engines": { "node": ">=12.0.0" }, @@ -29,12 +29,12 @@ "types": "./types/arm-search.d.ts", "devDependencies": { "@microsoft/api-extractor": "^7.18.11", - "@rollup/plugin-commonjs": "^21.0.1", + "@rollup/plugin-commonjs": "11.0.2", "@rollup/plugin-json": "^4.0.0", "@rollup/plugin-multi-entry": "^3.0.0", "@rollup/plugin-node-resolve": "^8.0.0", "mkdirp": "^1.0.4", - "rollup": "^2.0.0", + "rollup": "^1.16.3", "rollup-plugin-sourcemaps": "^0.4.2", "typescript": "~4.2.0", "uglify-js": "^3.4.9", @@ -99,4 +99,4 @@ }, "sideEffects": false, "autoPublish": true -} +} \ No newline at end of file diff --git a/sdk/search/arm-search/src/searchManagementClient.ts b/sdk/search/arm-search/src/searchManagementClient.ts index 59e4d9de3e20..a0fbd0d24751 100644 --- a/sdk/search/arm-search/src/searchManagementClient.ts +++ b/sdk/search/arm-search/src/searchManagementClient.ts @@ -61,7 +61,7 @@ export class SearchManagementClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-search/3.0.0`; + const packageDetails = `azsdk-js-arm-search/1.0.0-beta.1`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` diff --git a/sdk/search/arm-search/test/sampleTest.ts b/sdk/search/arm-search/test/sampleTest.ts new file mode 100644 index 000000000000..7ed89b043e1b --- /dev/null +++ b/sdk/search/arm-search/test/sampleTest.ts @@ -0,0 +1,48 @@ +/* + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. + */ + +import { + env, + record, + RecorderEnvironmentSetup, + Recorder +} from "@azure-tools/test-recorder"; +import * as assert from "assert"; + +const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + AZURE_CLIENT_ID: "azure_client_id", + AZURE_CLIENT_SECRET: "azure_client_secret", + AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888", + SUBSCRIPTION_ID: "azure_subscription_id" + }, + customizationsOnRecordings: [ + (recording: any): any => + recording.replace( + /"access_token":"[^"]*"/g, + `"access_token":"access_token"` + ) + ], + queryParametersToSkip: [] +}; + +describe("My test", () => { + let recorder: Recorder; + + beforeEach(async function() { + recorder = record(this, recorderEnvSetup); + }); + + afterEach(async function() { + await recorder.stop(); + }); + + it("sample test", async function() { + console.log("Hi, I'm a test!"); + }); +}); diff --git a/sdk/search/arm-search/tsconfig.json b/sdk/search/arm-search/tsconfig.json index 6e3251194117..3e6ae96443f3 100644 --- a/sdk/search/arm-search/tsconfig.json +++ b/sdk/search/arm-search/tsconfig.json @@ -9,11 +9,19 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, - "lib": ["es6", "dom"], + "lib": [ + "es6", + "dom" + ], "declaration": true, "outDir": "./dist-esm", "importHelpers": true }, - "include": ["./src/**/*.ts", "./test/**/*.ts"], - "exclude": ["node_modules"] -} + "include": [ + "./src/**/*.ts", + "./test/**/*.ts" + ], + "exclude": [ + "node_modules" + ] +} \ No newline at end of file diff --git a/sdk/search/ci.mgmt.yml b/sdk/search/ci.mgmt.yml index b61af871f295..4adc7a7c119c 100644 --- a/sdk/search/ci.mgmt.yml +++ b/sdk/search/ci.mgmt.yml @@ -1,5 +1,5 @@ # NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. - + trigger: branches: include: @@ -10,6 +10,7 @@ trigger: include: - sdk/search/ci.mgmt.yml - sdk/search/arm-search/ + - sdk/search/arm-search pr: branches: include: @@ -23,11 +24,11 @@ pr: include: - sdk/search/ci.mgmt.yml - sdk/search/arm-search/ - + - sdk/search/arm-search extends: template: /eng/pipelines/templates/stages/archetype-sdk-client.yml parameters: - ServiceDirectory: search + ServiceDirectory: search Artifacts: - name: azure-arm-search - safeName: azurearmsearch \ No newline at end of file + safeName: azurearmsearch diff --git a/sdk/search/ci.yml b/sdk/search/ci.yml index 28fea70dfcde..908f9367c1bd 100644 --- a/sdk/search/ci.yml +++ b/sdk/search/ci.yml @@ -1,4 +1,5 @@ # NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. + trigger: branches: include: @@ -11,6 +12,7 @@ trigger: exclude: - sdk/search/ci.mgmt.yml - sdk/search/arm-search/ + - sdk/search/arm-search pr: branches: include: @@ -26,10 +28,11 @@ pr: exclude: - sdk/search/ci.mgmt.yml - sdk/search/arm-search/ + - sdk/search/arm-search extends: template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml parameters: - ServiceDirectory: search + ServiceDirectory: search Artifacts: - name: azure-search-documents safeName: azuresearchdocuments