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 @azure/arm-confluent] confluent t2 config #4712

Closed
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@ export class ConfluentManagementClientContext extends msRestAzure.AzureServiceCl
if (!options) {
options = {};
}
if (!options.userAgent) {
if(!options.userAgent) {
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
}

super(credentials, options);

this.apiVersion = '2020-03-01';
this.apiVersion = '2020-03-01-preview';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
this.requestContentType = "application/json; charset=utf-8";
this.credentials = credentials;
this.subscriptionId = subscriptionId;

if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
this.acceptLanguage = options.acceptLanguage;
}
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
}
}
Expand Down
16 changes: 9 additions & 7 deletions sdk/confluent/arm-confluent/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ import * as msRest from "@azure/ms-rest-js";
export { BaseResource, CloudError };

/**
* Confluent Agreements Resource.
* Agreement Terms definition
*/
export interface ConfluentAgreementResource extends BaseResource {
/**
* ARM id of the resource.
* The ARM id of the resource.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly id?: string;
/**
* Name of the agreement.
* The name of the agreement.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly name?: string;
/**
* The type of the resource.
* The type of the agreement.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly type?: string;
Expand Down Expand Up @@ -217,8 +217,9 @@ export interface OrganizationResourceProperties {
/**
* Provision states for confluent RP. Possible values include: 'Accepted', 'Creating',
* 'Updating', 'Deleting', 'Succeeded', 'Failed', 'Canceled', 'Deleted', 'NotSpecified'
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
provisioningState?: ProvisionState;
readonly provisioningState?: ProvisionState;
/**
* Id of the Confluent organization.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
Expand Down Expand Up @@ -266,8 +267,9 @@ export interface OrganizationResource extends BaseResource {
/**
* Provision states for confluent RP. Possible values include: 'Accepted', 'Creating',
* 'Updating', 'Deleting', 'Succeeded', 'Failed', 'Canceled', 'Deleted', 'NotSpecified'
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
provisioningState?: ProvisionState;
readonly provisioningState?: ProvisionState;
/**
* Id of the Confluent organization.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
Expand Down Expand Up @@ -311,7 +313,7 @@ export interface OrganizationResourceUpdate {
*/
export interface MarketplaceAgreementsCreateOptionalParams extends msRest.RequestOptionsBase {
/**
* Confluent Agreement resource
* Confluent Marketplace Agreement resource
*/
body?: ConfluentAgreementResource;
}
Expand Down
4 changes: 3 additions & 1 deletion sdk/confluent/arm-confluent/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ export const UserDetail: msRest.CompositeMapper = {
emailAddress: {
serializedName: "emailAddress",
constraints: {
Pattern: /\S+@\S+\.\S+/
Pattern: /^\S+@\S+\.\S+$/
},
type: {
name: "String"
Expand Down Expand Up @@ -350,6 +350,7 @@ export const OrganizationResourceProperties: msRest.CompositeMapper = {
}
},
provisioningState: {
readOnly: true,
serializedName: "provisioningState",
type: {
name: "String"
Expand Down Expand Up @@ -422,6 +423,7 @@ export const OrganizationResource: msRest.CompositeMapper = {
}
},
provisioningState: {
readOnly: true,
serializedName: "properties.provisioningState",
type: {
name: "String"
Expand Down
2 changes: 1 addition & 1 deletion sdk/confluent/arm-confluent/src/models/parameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const apiVersion: msRest.OperationQueryParameter = {
required: true,
isConstant: true,
serializedName: "api-version",
defaultValue: '2020-03-01',
defaultValue: '2020-03-01-preview',
type: {
name: "String"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export class MarketplaceAgreements {
}

/**
* @summary Accept marketplace terms.
* @summary Create Confluent Marketplace agreement in the subscription.
* @param [options] The optional parameters
* @returns Promise<Models.MarketplaceAgreementsCreateResponse>
*/
Expand Down Expand Up @@ -110,6 +110,9 @@ const listOperationSpec: msRest.OperationSpec = {
urlParameters: [
Parameters.subscriptionId
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage
],
Expand All @@ -130,6 +133,9 @@ const createOperationSpec: msRest.OperationSpec = {
urlParameters: [
Parameters.subscriptionId
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage
],
Expand Down Expand Up @@ -158,6 +164,9 @@ const listNextOperationSpec: msRest.OperationSpec = {
urlParameters: [
Parameters.nextPageLink
],
queryParameters: [
Parameters.apiVersion
],
headerParameters: [
Parameters.acceptLanguage
],
Expand Down