Skip to content

Commit 099429c

Browse files
author
SDKAuto
committed
CodeGen from PR 14073 in Azure/azure-rest-api-specs
Merge bb2932a8b3cf727a88c736bfe127b4337141fe1d into f5fb71085c6846fd5d11b59a57381a5fcfd36840
1 parent 4b694c7 commit 099429c

File tree

11 files changed

+229
-23
lines changed

11 files changed

+229
-23
lines changed

‎sdk/appplatform/arm-appplatform/src/appPlatformManagementClientContext.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,25 @@ export class AppPlatformManagementClientContext extends msRestAzure.AzureService
3737
if (!options) {
3838
options = {};
3939
}
40-
if (!options.userAgent) {
40+
if(!options.userAgent) {
4141
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
4242
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
4343
}
4444

4545
super(credentials, options);
4646

47-
this.apiVersion = '2020-11-01-preview';
47+
this.apiVersion = '2021-06-01-preview';
4848
this.acceptLanguage = 'en-US';
4949
this.longRunningOperationRetryTimeout = 30;
5050
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
5151
this.requestContentType = "application/json; charset=utf-8";
5252
this.credentials = credentials;
5353
this.subscriptionId = subscriptionId;
5454

55-
if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
55+
if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
5656
this.acceptLanguage = options.acceptLanguage;
5757
}
58-
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
58+
if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
5959
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
6060
}
6161
}

‎sdk/appplatform/arm-appplatform/src/models/appsMappers.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export {
2222
ConfigServerProperties,
2323
ConfigServerResource,
2424
ConfigServerSettings,
25+
CustomContainer,
2526
CustomDomainProperties,
2627
CustomDomainResource,
2728
CustomDomainValidatePayload,
@@ -32,6 +33,7 @@ export {
3233
DeploymentSettings,
3334
ErrorModel,
3435
GitPatternRepository,
36+
ImageRegistryCredential,
3537
ManagedIdentityProperties,
3638
MonitoringSettingProperties,
3739
MonitoringSettingResource,
@@ -41,6 +43,7 @@ export {
4143
ProxyResource,
4244
RequiredTraffic,
4345
Resource,
46+
ResourceRequests,
4447
ResourceUploadDefinition,
4548
ServiceResource,
4649
Sku,

‎sdk/appplatform/arm-appplatform/src/models/bindingsMappers.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export {
2222
ConfigServerProperties,
2323
ConfigServerResource,
2424
ConfigServerSettings,
25+
CustomContainer,
2526
CustomDomainProperties,
2627
CustomDomainResource,
2728
DeploymentInstance,
@@ -30,6 +31,7 @@ export {
3031
DeploymentSettings,
3132
ErrorModel,
3233
GitPatternRepository,
34+
ImageRegistryCredential,
3335
ManagedIdentityProperties,
3436
MonitoringSettingProperties,
3537
MonitoringSettingResource,
@@ -39,6 +41,7 @@ export {
3941
ProxyResource,
4042
RequiredTraffic,
4143
Resource,
44+
ResourceRequests,
4245
ServiceResource,
4346
Sku,
4447
TemporaryDisk,

‎sdk/appplatform/arm-appplatform/src/models/certificatesMappers.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export {
2222
ConfigServerProperties,
2323
ConfigServerResource,
2424
ConfigServerSettings,
25+
CustomContainer,
2526
CustomDomainProperties,
2627
CustomDomainResource,
2728
DeploymentInstance,
@@ -30,6 +31,7 @@ export {
3031
DeploymentSettings,
3132
ErrorModel,
3233
GitPatternRepository,
34+
ImageRegistryCredential,
3335
ManagedIdentityProperties,
3436
MonitoringSettingProperties,
3537
MonitoringSettingResource,
@@ -39,6 +41,7 @@ export {
3941
ProxyResource,
4042
RequiredTraffic,
4143
Resource,
44+
ResourceRequests,
4245
ServiceResource,
4346
Sku,
4447
TemporaryDisk,

‎sdk/appplatform/arm-appplatform/src/models/configServersMappers.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export {
2323
ConfigServerSettings,
2424
ConfigServerSettingsErrorRecord,
2525
ConfigServerSettingsValidateResult,
26+
CustomContainer,
2627
CustomDomainProperties,
2728
CustomDomainResource,
2829
DeploymentInstance,
@@ -31,6 +32,7 @@ export {
3132
DeploymentSettings,
3233
ErrorModel,
3334
GitPatternRepository,
35+
ImageRegistryCredential,
3436
ManagedIdentityProperties,
3537
MonitoringSettingProperties,
3638
MonitoringSettingResource,
@@ -40,6 +42,7 @@ export {
4042
ProxyResource,
4143
RequiredTraffic,
4244
Resource,
45+
ResourceRequests,
4346
ServiceResource,
4447
Sku,
4548
TemporaryDisk,

‎sdk/appplatform/arm-appplatform/src/models/customDomainsMappers.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export {
2121
ConfigServerProperties,
2222
ConfigServerResource,
2323
ConfigServerSettings,
24+
CustomContainer,
2425
CustomDomainProperties,
2526
CustomDomainResource,
2627
CustomDomainResourceCollection,
@@ -30,6 +31,7 @@ export {
3031
DeploymentSettings,
3132
ErrorModel,
3233
GitPatternRepository,
34+
ImageRegistryCredential,
3335
ManagedIdentityProperties,
3436
MonitoringSettingProperties,
3537
MonitoringSettingResource,
@@ -39,6 +41,7 @@ export {
3941
ProxyResource,
4042
RequiredTraffic,
4143
Resource,
44+
ResourceRequests,
4245
ServiceResource,
4346
Sku,
4447
TemporaryDisk,

‎sdk/appplatform/arm-appplatform/src/models/deploymentsMappers.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export {
2121
ConfigServerProperties,
2222
ConfigServerResource,
2323
ConfigServerSettings,
24+
CustomContainer,
2425
CustomDomainProperties,
2526
CustomDomainResource,
2627
DeploymentInstance,
@@ -30,6 +31,7 @@ export {
3031
DeploymentSettings,
3132
ErrorModel,
3233
GitPatternRepository,
34+
ImageRegistryCredential,
3335
LogFileUrlResponse,
3436
ManagedIdentityProperties,
3537
MonitoringSettingProperties,
@@ -40,6 +42,7 @@ export {
4042
ProxyResource,
4143
RequiredTraffic,
4244
Resource,
45+
ResourceRequests,
4346
ServiceResource,
4447
Sku,
4548
TemporaryDisk,

‎sdk/appplatform/arm-appplatform/src/models/index.ts‎

Lines changed: 84 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ export interface ClusterResourceProperties {
120120
*/
121121
export interface Sku {
122122
/**
123-
* Name of the Sku
123+
* Name of the Sku. Default value: 'S0'.
124124
*/
125125
name?: string;
126126
/**
127-
* Tier of the Sku
127+
* Tier of the Sku. Default value: 'Standard'.
128128
*/
129129
tier?: string;
130130
/**
@@ -546,10 +546,6 @@ export interface AppResourceProperties {
546546
* Indicate if only https is allowed.
547547
*/
548548
httpsOnly?: boolean;
549-
/**
550-
* Indicate if end to end TLS is enabled.
551-
*/
552-
enableEndToEndTLS?: boolean;
553549
/**
554550
* Date time when the resource is created
555551
* **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -563,6 +559,10 @@ export interface AppResourceProperties {
563559
* Persistent disk settings
564560
*/
565561
persistentDisk?: PersistentDisk;
562+
/**
563+
* Indicate if end to end TLS is enabled.
564+
*/
565+
enableEndToEndTLS?: boolean;
566566
}
567567

568568
/**
@@ -798,12 +798,55 @@ export interface CustomDomainValidateResult {
798798
message?: string;
799799
}
800800

801+
/**
802+
* Credential of the image registry
803+
*/
804+
export interface ImageRegistryCredential {
805+
/**
806+
* The username of the image registry credential
807+
*/
808+
username?: string;
809+
/**
810+
* The password of the image registry credential
811+
*/
812+
password?: string;
813+
}
814+
815+
/**
816+
* Custom container payload
817+
*/
818+
export interface CustomContainer {
819+
/**
820+
* The name of the registry that contains the container image
821+
*/
822+
server?: string;
823+
/**
824+
* Container image of the custom container. This should be in the form of <repository>:<tag>
825+
* without the server name of the registry
826+
*/
827+
containerImage?: string;
828+
/**
829+
* Entrypoint array. Not executed within a shell. The docker image's ENTRYPOINT is used if this
830+
* is not provided.
831+
*/
832+
command?: string[];
833+
/**
834+
* Arguments to the entrypoint. The docker image's CMD is used if this is not provided.
835+
*/
836+
args?: string[];
837+
/**
838+
* Credential of the image registry
839+
*/
840+
imageRegistryCredential?: ImageRegistryCredential;
841+
}
842+
801843
/**
802844
* Source information for a deployment
803845
*/
804846
export interface UserSourceInfo {
805847
/**
806-
* Type of the source uploaded. Possible values include: 'Jar', 'NetCoreZip', 'Source'
848+
* Type of the source uploaded. Possible values include: 'Jar', 'NetCoreZip', 'Source',
849+
* 'Container'
807850
*/
808851
type?: UserSourceType;
809852
/**
@@ -820,22 +863,50 @@ export interface UserSourceInfo {
820863
* the relative path to the target module/project.
821864
*/
822865
artifactSelector?: string;
866+
/**
867+
* Custom container payload
868+
*/
869+
customContainer?: CustomContainer;
870+
}
871+
872+
/**
873+
* Deployment resource request payload
874+
*/
875+
export interface ResourceRequests {
876+
/**
877+
* Required CPU. 1 core can be represented by 1 or 1000m. This should be 500m or 1 for Basic
878+
* tier, and {500m, 1, 2, 3, 4} for Standard tier.
879+
*/
880+
cpu?: string;
881+
/**
882+
* Required memory. 1 GB can be represented by 1Gi or 1024Mi. This should be {512Mi, 1Gi, 2Gi}
883+
* for Basic tier, and {512Mi, 1Gi, 2Gi, ..., 8Gi} for Standard tier.
884+
*/
885+
memory?: string;
823886
}
824887

825888
/**
826889
* Deployment settings payload
827890
*/
828891
export interface DeploymentSettings {
829892
/**
830-
* Required CPU, basic tier should be 1, standard tier should be in range (1, 4). Default value:
831-
* 1.
893+
* Required CPU. This should be 1 for Basic tier, and in range [1, 4] for Standard tier. This is
894+
* deprecated starting from API version 2021-06-01-preview. Please use the resourceRequests field
895+
* to set the CPU size. Default value: 1.
832896
*/
833897
cpu?: number;
834898
/**
835-
* Required Memory size in GB, basic tier should be in range (1, 2), standard tier should be in
836-
* range (1, 8). Default value: 1.
899+
* Required Memory size in GB. This should be in range [1, 2] for Basic tier, and in range [1, 8]
900+
* for Standard tier. This is deprecated starting from API version 2021-06-01-preview. Please use
901+
* the resourceRequests field to set the the memory size. Default value: 1.
837902
*/
838903
memoryInGB?: number;
904+
/**
905+
* The requested resource quantity for required CPU and Memory. It is recommended that using this
906+
* field to represent the required CPU and Memory, the old field cpu and memoryInGB will be
907+
* deprecated later.
908+
*/
909+
resourceRequests?: ResourceRequests;
839910
/**
840911
* JVM parameter
841912
*/
@@ -1499,11 +1570,11 @@ export type AppResourceProvisioningState = 'Succeeded' | 'Failed' | 'Creating' |
14991570

15001571
/**
15011572
* Defines values for UserSourceType.
1502-
* Possible values include: 'Jar', 'NetCoreZip', 'Source'
1573+
* Possible values include: 'Jar', 'NetCoreZip', 'Source', 'Container'
15031574
* @readonly
15041575
* @enum {string}
15051576
*/
1506-
export type UserSourceType = 'Jar' | 'NetCoreZip' | 'Source';
1577+
export type UserSourceType = 'Jar' | 'NetCoreZip' | 'Source' | 'Container';
15071578

15081579
/**
15091580
* Defines values for RuntimeVersion.

0 commit comments

Comments
 (0)