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.

Sign up for GitHub

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-appplatform] [Spring Cloud] Add ToBeExportedForShoebox for MetricDimension definition. #4819

Closed
wants to merge 1 commit into from
Closed

[AutoPR @azure/arm-appplatform] [Spring Cloud] Add ToBeExportedForShoebox for MetricDimension definition. #4819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions sdk/appplatform/arm-appplatform/src/appPlatformManagementClientContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ export class AppPlatformManagementClientContext extends msRestAzure.AzureService
if (!options) {
options = {};
}
if (!options.userAgent) {
if(!options.userAgent) {
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
}

super(credentials, options);

this.apiVersion = '2020-11-01-preview';
this.apiVersion = '2021-06-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
3 changes: 3 additions & 0 deletions sdk/appplatform/arm-appplatform/src/models/appsMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export {
ConfigServerProperties,
ConfigServerResource,
ConfigServerSettings,
CustomContainer,
CustomDomainProperties,
CustomDomainResource,
CustomDomainValidatePayload,
Expand All @@ -32,6 +33,7 @@ export {
DeploymentSettings,
ErrorModel,
GitPatternRepository,
ImageRegistryCredential,
ManagedIdentityProperties,
MonitoringSettingProperties,
MonitoringSettingResource,
Expand All @@ -41,6 +43,7 @@ export {
ProxyResource,
RequiredTraffic,
Resource,
ResourceRequests,
ResourceUploadDefinition,
ServiceResource,
Sku,
Expand Down
3 changes: 3 additions & 0 deletions sdk/appplatform/arm-appplatform/src/models/bindingsMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export {
ConfigServerProperties,
ConfigServerResource,
ConfigServerSettings,
CustomContainer,
CustomDomainProperties,
CustomDomainResource,
DeploymentInstance,
Expand All @@ -30,6 +31,7 @@ export {
DeploymentSettings,
ErrorModel,
GitPatternRepository,
ImageRegistryCredential,
ManagedIdentityProperties,
MonitoringSettingProperties,
MonitoringSettingResource,
Expand All @@ -39,6 +41,7 @@ export {
ProxyResource,
RequiredTraffic,
Resource,
ResourceRequests,
ServiceResource,
Sku,
TemporaryDisk,
Expand Down
3 changes: 3 additions & 0 deletions sdk/appplatform/arm-appplatform/src/models/certificatesMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export {
ConfigServerProperties,
ConfigServerResource,
ConfigServerSettings,
CustomContainer,
CustomDomainProperties,
CustomDomainResource,
DeploymentInstance,
Expand All @@ -30,6 +31,7 @@ export {
DeploymentSettings,
ErrorModel,
GitPatternRepository,
ImageRegistryCredential,
ManagedIdentityProperties,
MonitoringSettingProperties,
MonitoringSettingResource,
Expand All @@ -39,6 +41,7 @@ export {
ProxyResource,
RequiredTraffic,
Resource,
ResourceRequests,
ServiceResource,
Sku,
TemporaryDisk,
Expand Down
3 changes: 3 additions & 0 deletions sdk/appplatform/arm-appplatform/src/models/configServersMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export {
ConfigServerSettings,
ConfigServerSettingsErrorRecord,
ConfigServerSettingsValidateResult,
CustomContainer,
CustomDomainProperties,
CustomDomainResource,
DeploymentInstance,
Expand All @@ -31,6 +32,7 @@ export {
DeploymentSettings,
ErrorModel,
GitPatternRepository,
ImageRegistryCredential,
ManagedIdentityProperties,
MonitoringSettingProperties,
MonitoringSettingResource,
Expand All @@ -40,6 +42,7 @@ export {
ProxyResource,
RequiredTraffic,
Resource,
ResourceRequests,
ServiceResource,
Sku,
TemporaryDisk,
Expand Down
3 changes: 3 additions & 0 deletions sdk/appplatform/arm-appplatform/src/models/customDomainsMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export {
ConfigServerProperties,
ConfigServerResource,
ConfigServerSettings,
CustomContainer,
CustomDomainProperties,
CustomDomainResource,
CustomDomainResourceCollection,
Expand All @@ -30,6 +31,7 @@ export {
DeploymentSettings,
ErrorModel,
GitPatternRepository,
ImageRegistryCredential,
ManagedIdentityProperties,
MonitoringSettingProperties,
MonitoringSettingResource,
Expand All @@ -39,6 +41,7 @@ export {
ProxyResource,
RequiredTraffic,
Resource,
ResourceRequests,
ServiceResource,
Sku,
TemporaryDisk,
Expand Down
3 changes: 3 additions & 0 deletions sdk/appplatform/arm-appplatform/src/models/deploymentsMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export {
ConfigServerProperties,
ConfigServerResource,
ConfigServerSettings,
CustomContainer,
CustomDomainProperties,
CustomDomainResource,
DeploymentInstance,
Expand All @@ -30,6 +31,7 @@ export {
DeploymentSettings,
ErrorModel,
GitPatternRepository,
ImageRegistryCredential,
LogFileUrlResponse,
ManagedIdentityProperties,
MonitoringSettingProperties,
Expand All @@ -40,6 +42,7 @@ export {
ProxyResource,
RequiredTraffic,
Resource,
ResourceRequests,
ServiceResource,
Sku,
TemporaryDisk,
Expand Down
101 changes: 88 additions & 13 deletions sdk/appplatform/arm-appplatform/src/models/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ export interface ClusterResourceProperties {
*/
export interface Sku {
/**
* Name of the Sku
* Name of the Sku. Default value: 'S0'.
*/
name?: string;
/**
* Tier of the Sku
* Tier of the Sku. Default value: 'Standard'.
*/
tier?: string;
/**
Expand Down Expand Up @@ -546,10 +546,6 @@ export interface AppResourceProperties {
* Indicate if only https is allowed.
*/
httpsOnly?: boolean;
/**
* Indicate if end to end TLS is enabled.
*/
enableEndToEndTLS?: boolean;
/**
* Date time when the resource is created
* **NOTE: This property will not be serialized. It can only be populated by the server.**
Expand All @@ -563,6 +559,10 @@ export interface AppResourceProperties {
* Persistent disk settings
*/
persistentDisk?: PersistentDisk;
/**
* Indicate if end to end TLS is enabled.
*/
enableEndToEndTLS?: boolean;
}

/**
Expand Down Expand Up @@ -798,12 +798,55 @@ export interface CustomDomainValidateResult {
message?: string;
}

/**
* Credential of the image registry
*/
export interface ImageRegistryCredential {
/**
* The username of the image registry credential
*/
username?: string;
/**
* The password of the image registry credential
*/
password?: string;
}

/**
* Custom container payload
*/
export interface CustomContainer {
/**
* The name of the registry that contains the container image
*/
server?: string;
/**
* Container image of the custom container. This should be in the form of <repository>:<tag>
* without the server name of the registry
*/
containerImage?: string;
/**
* Entrypoint array. Not executed within a shell. The docker image's ENTRYPOINT is used if this
* is not provided.
*/
command?: string[];
/**
* Arguments to the entrypoint. The docker image's CMD is used if this is not provided.
*/
args?: string[];
/**
* Credential of the image registry
*/
imageRegistryCredential?: ImageRegistryCredential;
}

/**
* Source information for a deployment
*/
export interface UserSourceInfo {
/**
* Type of the source uploaded. Possible values include: 'Jar', 'NetCoreZip', 'Source'
* Type of the source uploaded. Possible values include: 'Jar', 'NetCoreZip', 'Source',
* 'Container'
*/
type?: UserSourceType;
/**
Expand All @@ -820,22 +863,50 @@ export interface UserSourceInfo {
* the relative path to the target module/project.
*/
artifactSelector?: string;
/**
* Custom container payload
*/
customContainer?: CustomContainer;
}

/**
* Deployment resource request payload
*/
export interface ResourceRequests {
/**
* Required CPU. 1 core can be represented by 1 or 1000m. This should be 500m or 1 for Basic
* tier, and {500m, 1, 2, 3, 4} for Standard tier.
*/
cpu?: string;
/**
* Required memory. 1 GB can be represented by 1Gi or 1024Mi. This should be {512Mi, 1Gi, 2Gi}
* for Basic tier, and {512Mi, 1Gi, 2Gi, ..., 8Gi} for Standard tier.
*/
memory?: string;
}

/**
* Deployment settings payload
*/
export interface DeploymentSettings {
/**
* Required CPU, basic tier should be 1, standard tier should be in range (1, 4). Default value:
* 1.
* Required CPU. This should be 1 for Basic tier, and in range [1, 4] for Standard tier. This is
* deprecated starting from API version 2021-06-01-preview. Please use the resourceRequests field
* to set the CPU size. Default value: 1.
*/
cpu?: number;
/**
* Required Memory size in GB, basic tier should be in range (1, 2), standard tier should be in
* range (1, 8). Default value: 1.
* Required Memory size in GB. This should be in range [1, 2] for Basic tier, and in range [1, 8]
* for Standard tier. This is deprecated starting from API version 2021-06-01-preview. Please use
* the resourceRequests field to set the the memory size. Default value: 1.
*/
memoryInGB?: number;
/**
* The requested resource quantity for required CPU and Memory. It is recommended that using this
* field to represent the required CPU and Memory, the old field cpu and memoryInGB will be
* deprecated later.
*/
resourceRequests?: ResourceRequests;
/**
* JVM parameter
*/
Expand Down Expand Up @@ -1007,6 +1078,10 @@ export interface MetricDimension {
* Localized friendly display name of the dimension
*/
displayName?: string;
/**
* Whether this dimension should be included for the Shoebox export scenario
*/
toBeExportedForShoebox?: boolean;
}

/**
Expand Down Expand Up @@ -1499,11 +1574,11 @@ export type AppResourceProvisioningState = 'Succeeded' | 'Failed' | 'Creating' |

/**
* Defines values for UserSourceType.
* Possible values include: 'Jar', 'NetCoreZip', 'Source'
* Possible values include: 'Jar', 'NetCoreZip', 'Source', 'Container'
* @readonly
* @enum {string}
*/
export type UserSourceType = 'Jar' | 'NetCoreZip' | 'Source';
export type UserSourceType = 'Jar' | 'NetCoreZip' | 'Source' | 'Container';

/**
* Defines values for RuntimeVersion.
Expand Down
Loading