Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into witemple-msft/rollup2
Browse files Browse the repository at this point in the history
  • Loading branch information
witemple-msft committed Jan 26, 2022
2 parents 64599af + c702456 commit a022f51
Show file tree
Hide file tree
Showing 57 changed files with 1,676 additions and 910 deletions.
5 changes: 4 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
/sdk/deviceupdate/ @dpokluda

# PRLabel: %Digital Twins
/sdk/digitaltwins/ @johngallardo
/sdk/digitaltwins/ @johngallardo @YoDaMa @olivakar

# PRLabel: %Event Grid
/sdk/eventgrid/ @xirzec @ellismg
Expand Down Expand Up @@ -119,6 +119,9 @@
# PRLabel: %Cognitive - Metrics Advisor
/sdk/metricsadvisor/ @jeremymeng @KarishmaGhiya

# PRLabel: %Cognitive - Anomaly Detector
/sdk/anomalydetector/ @conhua @mengaims @juaduan @moreOver0

# PRLabel: %Search
/sdk/search/ @xirzec @sarangan12

Expand Down
25 changes: 11 additions & 14 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
**Checklists**
- [ ] Added impacted package name to the issue description

**Packages impacted by this PR:**


**Issues associated with this PR:**
### Packages impacted by this PR


**Describe the problem that is addressed by this PR:**
### Issues associated with this PR


**What are the possible designs available to address the problem**
### Describe the problem that is addressed by this PR


**If there are more than one possible design, why was the one in this PR chosen?**
### What are the possible designs available to address the problem? If there are more than one possible design, why was the one in this PR chosen?


**Does this PR needs any fixes in the SDK Generator?** _(If so, create an Issue in the [Autorest/typescript](https://github.com/Azure/autorest.typescript) repository and link it here)_
### Are there test cases added in this PR? _(If not, why?)_


**Are there test cases added in this PR?**_(If not, why?)_
### Provide a list of related PRs _(if any)_


**Provide a list of related PRs**_(if any)_
### Command used to generate this PR:**_(Applicable only to SDK release request PRs)_


**Command used to generate this PR:**_(Applicable only to SDK release request PRs)_
### Checklists
- [ ] Added impacted package name to the issue description
- [ ] Does this PR needs any fixes in the SDK Generator?** _(If so, create an Issue in the [Autorest/typescript](https://github.com/Azure/autorest.typescript) repository and link it here)_
- [ ] Added a changelog (if necessary)
26 changes: 11 additions & 15 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@

**Checklists**
- [ ] Added impacted package name to the issue description

**Packages impacted by this PR:**

### Packages impacted by this PR

**Issues associated with this PR:**

### Issues associated with this PR

**Describe the problem that is addressed by this PR:**

### Describe the problem that is addressed by this PR

**What are the possible designs available to address the problem**

### What are the possible designs available to address the problem? If there are more than one possible design, why was the one in this PR chosen?

**If there are more than one possible design, why was the one in this PR chosen?**

### Are there test cases added in this PR? _(If not, why?)_

**Does this PR needs any fixes in the SDK Generator?** _(If so, create an Issue in the [Autorest/typescript](https://github.com/Azure/autorest.typescript) repository and link it here)_

### Provide a list of related PRs _(if any)_

**Are there test cases added in this PR?**_(If not, why?)_

### Command used to generate this PR:**_(Applicable only to SDK release request PRs)_

**Provide a list of related PRs**_(if any)_


**Command used to generate this PR:**_(Applicable only to SDK release request PRs)_
### Checklists
- [ ] Added impacted package name to the issue description
- [ ] Does this PR needs any fixes in the SDK Generator?** _(If so, create an Issue in the [Autorest/typescript](https://github.com/Azure/autorest.typescript) repository and link it here)_
- [ ] Added a changelog (if necessary)
20 changes: 20 additions & 0 deletions common/tools/dev-tool/src/util/testProxyUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { spawn } from "child_process";
import path from "path";
import { IncomingMessage, request, RequestOptions } from "http";
import fs from "fs-extra";
import os from "os";
import { createPrinter } from "./printer";
import { resolveRoot } from "./resolveProject";

Expand All @@ -25,6 +26,25 @@ export async function startProxyTool(): Promise<void> {
subprocess.stderr.pipe(out);

log.info(`Check the output file "${outFileName}" for test-proxy logs.`);

await new Promise<void>((resolve, reject) => {
subprocess.on("exit", (code) => {
if (code === 0) {
resolve();
} else {
fs.readFile(`./${outFileName}`, (_err, data) => {
const lines = data.toString().split(os.EOL);
reject(
new Error(
`Could not start test proxy. Below is the last 10 lines of output. See ${outFileName} for the full output.\n${lines
.slice(-10)
.join("\n")}`
)
);
});
}
});
});
}

export async function stopProxyTool(): Promise<void> {
Expand Down
4 changes: 3 additions & 1 deletion eng/common/docgeneration/Generate-DocIndex.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ function GenerateDocfxTocContent([Hashtable]$tocContent, [String]$lang, [String]
$serviceName = $serviceMapping.Value[0]
$displayName = $serviceMapping.Value[1]

$fileName = ($serviceName -replace '\s', '').ToLower().Trim()
# handle spaces in service name, EG "Confidential Ledger"
# handle / in service name, EG "Database for MySQL/PostgreSQL". Leaving a "/" present will generate a bad link location.
$fileName = ($serviceName -replace '\s', '').Replace("/","").ToLower().Trim()
if ($visitedService.ContainsKey($serviceName)) {
if ($displayName) {
Add-Content -Path "$($YmlPath)/${fileName}.md" -Value "#### $artifact`n##### ($displayName)"
Expand Down
2 changes: 1 addition & 1 deletion eng/common/pipelines/templates/steps/verify-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ parameters:
Recursive: $false
CheckLinkGuidance: $true
Urls: '(Get-ChildItem -Path ./ -Recurse -Include *.md)'
BranchReplaceRegex: "^(${env:SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI}.*/(?:blob|tree)/)$(DefaultBranch)(/.*)$"
BranchReplaceRegex: "^(${env:SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI}/(?:blob|tree)/)$(DefaultBranch)(/.*)$"
BranchReplacementName: "${env:SYSTEM_PULLREQUEST_SOURCECOMMITID}"
Condition: succeeded() # If you want to run on failure for the link checker, set it to `Condition: succeededOrFailed()`.

Expand Down
4 changes: 2 additions & 2 deletions sdk/applicationinsights/arm-appinsights/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Release History

## 5.0.0-beta.1 (2022-01-21)
## 5.0.0-beta.2 (2022-01-24)

The package of @azure/arm-appinsights is using our next generation design principles since version 5.0.0-beta.1, which contains breaking changes.
The package of @azure/arm-appinsights is using our next generation design principles since version 5.0.0-beta.2, which contains breaking changes.

To understand the detail of the change, please refer to [Changelog](https://aka.ms/js-track2-changelog).

Expand Down
2 changes: 1 addition & 1 deletion sdk/applicationinsights/arm-appinsights/_meta.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"commit": "f9a6cb686bcc0f1b23761db19f2491c5c4df95cb",
"commit": "2a2aa10bc5e772934d22628faf45a53055ee96c6",
"readme": "specification/applicationinsights/resource-manager/readme.md",
"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=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/applicationinsights/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20220114.1",
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
Expand Down
25 changes: 19 additions & 6 deletions sdk/applicationinsights/arm-appinsights/api-extractor.json
Original file line number Diff line number Diff line change
@@ -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-appinsights.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"
}
}
}
}
}
20 changes: 15 additions & 5 deletions sdk/applicationinsights/arm-appinsights/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,24 @@
"sdk-type": "mgmt",
"author": "Microsoft Corporation",
"description": "A generated SDK for ApplicationInsightsManagementClient.",
"version": "5.0.0-beta.1",
"engines": { "node": ">=12.0.0" },
"version": "5.0.0-beta.2",
"engines": {
"node": ">=12.0.0"
},
"dependencies": {
"@azure/core-paging": "^1.2.0",
"@azure/core-client": "^1.0.0",
"@azure/core-auth": "^1.3.0",
"@azure/core-rest-pipeline": "^1.1.0",
"tslib": "^2.2.0"
},
"keywords": ["node", "azure", "typescript", "browser", "isomorphic"],
"keywords": [
"node",
"azure",
"typescript",
"browser",
"isomorphic"
],
"license": "MIT",
"main": "./dist/index.js",
"module": "./dist-esm/src/index.js",
Expand All @@ -39,7 +47,9 @@
"type": "git",
"url": "https://github.com/Azure/azure-sdk-for-js.git"
},
"bugs": { "url": "https://github.com/Azure/azure-sdk-for-js/issues" },
"bugs": {
"url": "https://github.com/Azure/azure-sdk-for-js/issues"
},
"files": [
"dist/**/*.js",
"dist/**/*.js.map",
Expand Down Expand Up @@ -95,4 +105,4 @@
]
},
"autoPublish": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,10 @@ export type APIKeysListResponse = ApplicationInsightsComponentAPIKeyListResult;
// @public
export type ApplicationInsightsComponent = ComponentsResource & {
kind: string;
etag?: string;
readonly applicationId?: string;
readonly appId?: string;
readonly namePropertiesName?: string;
applicationType?: ApplicationType;
flowType?: FlowType;
requestSource?: RequestSource;
Expand All @@ -166,10 +168,14 @@ export type ApplicationInsightsComponent = ComponentsResource & {
retentionInDays?: number;
disableIpMasking?: boolean;
immediatePurgeDataOn30Days?: boolean;
workspaceResourceId?: string;
readonly laMigrationDate?: Date;
readonly privateLinkScopedResources?: PrivateLinkScopedResource[];
publicNetworkAccessForIngestion?: PublicNetworkAccessType;
publicNetworkAccessForQuery?: PublicNetworkAccessType;
ingestionMode?: IngestionMode;
disableLocalAuth?: boolean;
forceCustomerStorageForProfiler?: boolean;
};

// @public
Expand Down Expand Up @@ -393,8 +399,6 @@ export class ApplicationInsightsManagementClient extends coreClient.ServiceClien
// (undocumented)
myWorkbooks: MyWorkbooks;
// (undocumented)
operations: Operations;
// (undocumented)
proactiveDetectionConfigurations: ProactiveDetectionConfigurations;
// (undocumented)
subscriptionId: string;
Expand Down Expand Up @@ -656,6 +660,17 @@ export interface ErrorResponse {
message?: string;
}

// @public (undocumented)
export interface ErrorResponseComponents {
error?: ErrorResponseComponentsError;
}

// @public
export interface ErrorResponseComponentsError {
readonly code?: string;
readonly message?: string;
}

// @public (undocumented)
export interface ErrorResponseLinkedStorage {
error?: ErrorResponseLinkedStorageError;
Expand Down Expand Up @@ -1158,30 +1173,12 @@ export interface OperationListResult {
// @public
export interface OperationLive {
display?: OperationInfo;
isDataAction?: boolean;
name?: string;
origin?: string;
properties?: Record<string, unknown>;
}

// @public
export interface Operations {
list(options?: OperationsListOptionalParams): PagedAsyncIterableIterator<OperationLive>;
}

// @public
export interface OperationsListNextOptionalParams extends coreClient.OperationOptions {
}

// @public
export type OperationsListNextResponse = OperationsListResult;

// @public
export interface OperationsListOptionalParams extends coreClient.OperationOptions {
}

// @public
export type OperationsListResponse = OperationsListResult;

// @public
export interface OperationsListResult {
nextLink?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import {
WorkbooksImpl,
ComponentsImpl,
ComponentLinkedStorageAccountsOperationsImpl,
OperationsImpl,
LiveTokenImpl
} from "./operations";
import {
Expand All @@ -49,7 +48,6 @@ import {
Workbooks,
Components,
ComponentLinkedStorageAccountsOperations,
Operations,
LiveToken
} from "./operationsInterfaces";
import { ApplicationInsightsManagementClientOptionalParams } from "./models";
Expand Down Expand Up @@ -85,7 +83,7 @@ export class ApplicationInsightsManagementClient extends coreClient.ServiceClien
credential: credentials
};

const packageDetails = `azsdk-js-arm-appinsights/5.0.0-beta.1`;
const packageDetails = `azsdk-js-arm-appinsights/5.0.0-beta.2`;
const userAgentPrefix =
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
Expand Down Expand Up @@ -134,7 +132,6 @@ export class ApplicationInsightsManagementClient extends coreClient.ServiceClien
this.componentLinkedStorageAccountsOperations = new ComponentLinkedStorageAccountsOperationsImpl(
this
);
this.operations = new OperationsImpl(this);
this.liveToken = new LiveTokenImpl(this);
}

Expand All @@ -156,6 +153,5 @@ export class ApplicationInsightsManagementClient extends coreClient.ServiceClien
workbooks: Workbooks;
components: Components;
componentLinkedStorageAccountsOperations: ComponentLinkedStorageAccountsOperations;
operations: Operations;
liveToken: LiveToken;
}
Loading

0 comments on commit a022f51

Please sign in to comment.