Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR search/resource-manager] Azure Search: Resource Manager: Support 'None' Identity type #1468

Merged
merged 1 commit into from
Mar 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@azure/arm-search/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Microsoft
Copyright (c) 2019 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
Expand Down
8 changes: 4 additions & 4 deletions packages/@azure/arm-search/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This package contains an isomorphic SDK for SearchManagementClient.

### How to Install

```
```bash
npm install @azure/arm-search
```

Expand All @@ -19,13 +19,13 @@ npm install @azure/arm-search

##### Install @azure/ms-rest-nodeauth

```
```bash
npm install @azure/ms-rest-nodeauth
```

##### Sample code

```ts
```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
Expand All @@ -47,7 +47,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => {

##### Install @azure/ms-rest-browserauth

```
```bash
npm install @azure/ms-rest-browserauth
```

Expand Down
47 changes: 47 additions & 0 deletions packages/@azure/arm-search/lib/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,11 @@ export interface Identity {
* the server.**
*/
readonly tenantId?: string;
/**
* @member {IdentityType} type The identity type. Possible values include:
* 'None', 'SystemAssigned'
*/
type: IdentityType;
}

/**
Expand Down Expand Up @@ -503,6 +508,21 @@ export interface ServicesListByResourceGroupOptionalParams extends msRest.Reques
searchManagementRequestOptions?: SearchManagementRequestOptions;
}

/**
* @interface
* An interface representing ServicesListBySubscriptionOptionalParams.
* Optional Parameters.
*
* @extends RequestOptionsBase
*/
export interface ServicesListBySubscriptionOptionalParams extends msRest.RequestOptionsBase {
/**
* @member {SearchManagementRequestOptions} [searchManagementRequestOptions]
* Additional parameters for the operation
*/
searchManagementRequestOptions?: SearchManagementRequestOptions;
}

/**
* @interface
* An interface representing ServicesCheckNameAvailabilityOptionalParams.
Expand Down Expand Up @@ -624,6 +644,14 @@ export type SearchServiceStatus = 'running' | 'provisioning' | 'deleting' | 'deg
*/
export type ProvisioningState = 'succeeded' | 'provisioning' | 'failed';

/**
* Defines values for IdentityType.
* Possible values include: 'None', 'SystemAssigned'
* @readonly
* @enum {string}
*/
export type IdentityType = 'None' | 'SystemAssigned';

/**
* Defines values for AdminKeyKind.
* Possible values include: 'primary', 'secondary'
Expand Down Expand Up @@ -803,6 +831,25 @@ export type ServicesListByResourceGroupResponse = SearchServiceListResult & {
};
};

/**
* Contains response data for the listBySubscription operation.
*/
export type ServicesListBySubscriptionResponse = SearchServiceListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;
/**
* The response body as parsed JSON or XML
*/
parsedBody: SearchServiceListResult;
};
};

/**
* Contains response data for the checkNameAvailability operation.
*/
Expand Down
8 changes: 5 additions & 3 deletions packages/@azure/arm-search/lib/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,13 @@ export const Identity: msRest.CompositeMapper = {
},
type: {
required: true,
isConstant: true,
serializedName: "type",
defaultValue: 'SystemAssigned',
type: {
name: "String"
name: "Enum",
allowedValues: [
"None",
"SystemAssigned"
]
}
}
}
Expand Down
48 changes: 48 additions & 0 deletions packages/@azure/arm-search/lib/operations/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,30 @@ export class Services {
callback) as Promise<Models.ServicesListByResourceGroupResponse>;
}

/**
* Gets a list of all Search services in the given subscription.
* @param [options] The optional parameters
* @returns Promise<Models.ServicesListBySubscriptionResponse>
*/
listBySubscription(options?: Models.ServicesListBySubscriptionOptionalParams): Promise<Models.ServicesListBySubscriptionResponse>;
/**
* @param callback The callback
*/
listBySubscription(callback: msRest.ServiceCallback<Models.SearchServiceListResult>): void;
/**
* @param options The optional parameters
* @param callback The callback
*/
listBySubscription(options: Models.ServicesListBySubscriptionOptionalParams, callback: msRest.ServiceCallback<Models.SearchServiceListResult>): void;
listBySubscription(options?: Models.ServicesListBySubscriptionOptionalParams | msRest.ServiceCallback<Models.SearchServiceListResult>, callback?: msRest.ServiceCallback<Models.SearchServiceListResult>): Promise<Models.ServicesListBySubscriptionResponse> {
return this.client.sendOperationRequest(
{
options
},
listBySubscriptionOperationSpec,
callback) as Promise<Models.ServicesListBySubscriptionResponse>;
}

/**
* Checks whether or not the given Search service name is available for use. Search service names
* must be globally unique since they are part of the service URI
Expand Down Expand Up @@ -369,6 +393,30 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = {
serializer
};

const listBySubscriptionOperationSpec: msRest.OperationSpec = {
httpMethod: "GET",
path: "subscriptions/{subscriptionId}/providers/Microsoft.Search/searchServices",
urlParameters: [
Parameters.subscriptionId
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage,
Parameters.clientRequestId
],
responses: {
200: {
bodyMapper: Mappers.SearchServiceListResult
},
default: {
bodyMapper: Mappers.CloudError
}
},
serializer
};

const checkNameAvailabilityOperationSpec: msRest.OperationSpec = {
httpMethod: "POST",
path: "subscriptions/{subscriptionId}/providers/Microsoft.Search/checkNameAvailability",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";

const packageName = "@azure/arm-search";
const packageVersion = "0.1.0";
const packageVersion = "1.3.0";

export class SearchManagementClientContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials;
Expand Down
8 changes: 4 additions & 4 deletions packages/@azure/arm-search/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "SearchManagementClient Library with typescript type definitions for node.js and browser.",
"version": "1.3.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^1.1.0",
"@azure/ms-rest-js": "^1.1.0",
"@azure/ms-rest-azure-js": "^1.2.0",
"@azure/ms-rest-js": "^1.2.0",
"tslib": "^1.9.3"
},
"keywords": [
Expand All @@ -23,6 +23,7 @@
"typescript": "^3.1.1",
"rollup": "^0.66.2",
"rollup-plugin-node-resolve": "^3.4.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.4.9"
},
"homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/packages/@azure/arm-search",
Expand Down Expand Up @@ -51,6 +52,5 @@
"minify": "uglifyjs -c -m --comments --source-map \"content='./dist/arm-search.js.map'\" -o ./dist/arm-search.min.js ./dist/arm-search.js",
"prepack": "npm install && npm run build"
},
"sideEffects": false,
"authPublish": true
"sideEffects": false
}
22 changes: 14 additions & 8 deletions packages/@azure/arm-search/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import rollup from "rollup";
import nodeResolve from "rollup-plugin-node-resolve";
import sourcemaps from "rollup-plugin-sourcemaps";

/**
* @type {import('rollup').RollupFileOptions}
* @type {rollup.RollupFileOptions}
*/
const config = {
input: './esm/searchManagementClient.js',
external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"],
input: "./esm/searchManagementClient.js",
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
],
output: {
file: "./dist/arm-search.js",
format: "umd",
Expand All @@ -16,16 +22,16 @@ const config = {
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Licensed under the MIT License. See License.txt in the project root for license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/`
},
plugins: [
nodeResolve({ module: true })
nodeResolve({ module: true }),
sourcemaps()
]
};

export default config;