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

API management: 2019-01-01 update. #4631

Merged
merged 1 commit into from
Jul 28, 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
4 changes: 3 additions & 1 deletion apimanagement/resource-manager/v2019_01_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-apimanagement</artifactId>
<version>1.0.0-beta</version>
<version>1.0.0-beta-1</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for ApiManagement Management</name>
<description>This package contains Microsoft ApiManagement Management SDK.</description>
Expand Down Expand Up @@ -71,6 +71,8 @@
<artifactId>azure-arm-client-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
<version>1.6.5</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,38 @@ public class ApiManagementServiceBaseProperties {
private List<AdditionalLocation> additionalLocations;

/**
* Custom properties of the API Management service. Setting
* Custom properties of the API Management service.&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168`
* will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0,
* 1.1 and 1.2). Setting
* 1.1 and 1.2).&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11`
* can be used to disable just TLS 1.1 and setting
* can be used to disable just TLS 1.1.&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10`
* can be used to disable TLS 1.0 on an API Management service.
* can be used to disable TLS 1.0 on an API Management
* service.&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11`
* can be used to disable just TLS 1.1 for communications with
* backends.&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10`
* can be used to disable TLS 1.0 for communications with
* backends.&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2`
* can be used to enable HTTP2 protocol on an API Management
* service.&lt;/br&gt;Not specifying any of these properties on PATCH
* operation will reset omitted properties' values to their defaults. For
* all the settings except Http2 the default value is `True` if the service
* was created on or before April 1st 2018 and `False` otherwise. Http2
* setting's default value is `False`.&lt;/br&gt;&lt;/br&gt;You can disable
* any of next ciphers by using settings
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
* TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
* TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
* TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
* TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
* TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA,
* TLS_RSA_WITH_AES_128_CBC_SHA. For example,
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
* The default value is `true` for them.
*/
@JsonProperty(value = "customProperties")
private Map<String, String> customProperties;
Expand Down Expand Up @@ -321,7 +345,7 @@ public ApiManagementServiceBaseProperties withAdditionalLocations(List<Additiona
}

/**
* Get custom properties of the API Management service. Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1 and setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.
* Get custom properties of the API Management service.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to disable just TLS 1.1 for communications with backends.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to disable TLS 1.0 for communications with backends.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable HTTP2 protocol on an API Management service.&lt;/br&gt;Not specifying any of these properties on PATCH operation will reset omitted properties' values to their defaults. For all the settings except Http2 the default value is `True` if the service was created on or before April 1st 2018 and `False` otherwise. Http2 setting's default value is `False`.&lt;/br&gt;&lt;/br&gt;You can disable any of next ciphers by using settings `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA. For example, `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. The default value is `true` for them.
*
* @return the customProperties value
*/
Expand All @@ -330,7 +354,7 @@ public Map<String, String> customProperties() {
}

/**
* Set custom properties of the API Management service. Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1 and setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.
* Set custom properties of the API Management service.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to disable just TLS 1.1 for communications with backends.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to disable TLS 1.0 for communications with backends.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable HTTP2 protocol on an API Management service.&lt;/br&gt;Not specifying any of these properties on PATCH operation will reset omitted properties' values to their defaults. For all the settings except Http2 the default value is `True` if the service was created on or before April 1st 2018 and `False` otherwise. Http2 setting's default value is `False`.&lt;/br&gt;&lt;/br&gt;You can disable any of next ciphers by using settings `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA. For example, `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. The default value is `true` for them.
*
* @param customProperties the customProperties value to set
* @return the ApiManagementServiceBaseProperties object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,38 @@ public class ApiManagementServiceUpdateParameters extends ApimResource {
private List<AdditionalLocation> additionalLocations;

/**
* Custom properties of the API Management service. Setting
* Custom properties of the API Management service.&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168`
* will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0,
* 1.1 and 1.2). Setting
* 1.1 and 1.2).&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11`
* can be used to disable just TLS 1.1 and setting
* can be used to disable just TLS 1.1.&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10`
* can be used to disable TLS 1.0 on an API Management service.
* can be used to disable TLS 1.0 on an API Management
* service.&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11`
* can be used to disable just TLS 1.1 for communications with
* backends.&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10`
* can be used to disable TLS 1.0 for communications with
* backends.&lt;/br&gt;Setting
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2`
* can be used to enable HTTP2 protocol on an API Management
* service.&lt;/br&gt;Not specifying any of these properties on PATCH
* operation will reset omitted properties' values to their defaults. For
* all the settings except Http2 the default value is `True` if the service
* was created on or before April 1st 2018 and `False` otherwise. Http2
* setting's default value is `False`.&lt;/br&gt;&lt;/br&gt;You can disable
* any of next ciphers by using settings
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`:
* TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
* TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
* TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
* TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256,
* TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA,
* TLS_RSA_WITH_AES_128_CBC_SHA. For example,
* `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`.
* The default value is `true` for them.
*/
@JsonProperty(value = "properties.customProperties")
private Map<String, String> customProperties;
Expand Down Expand Up @@ -353,7 +377,7 @@ public ApiManagementServiceUpdateParameters withAdditionalLocations(List<Additio
}

/**
* Get custom properties of the API Management service. Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1 and setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.
* Get custom properties of the API Management service.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to disable just TLS 1.1 for communications with backends.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to disable TLS 1.0 for communications with backends.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable HTTP2 protocol on an API Management service.&lt;/br&gt;Not specifying any of these properties on PATCH operation will reset omitted properties' values to their defaults. For all the settings except Http2 the default value is `True` if the service was created on or before April 1st 2018 and `False` otherwise. Http2 setting's default value is `False`.&lt;/br&gt;&lt;/br&gt;You can disable any of next ciphers by using settings `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA. For example, `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. The default value is `true` for them.
*
* @return the customProperties value
*/
Expand All @@ -362,7 +386,7 @@ public Map<String, String> customProperties() {
}

/**
* Set custom properties of the API Management service. Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1 and setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.
* Set custom properties of the API Management service.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to disable just TLS 1.1 for communications with backends.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to disable TLS 1.0 for communications with backends.&lt;/br&gt;Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable HTTP2 protocol on an API Management service.&lt;/br&gt;Not specifying any of these properties on PATCH operation will reset omitted properties' values to their defaults. For all the settings except Http2 the default value is `True` if the service was created on or before April 1st 2018 and `False` otherwise. Http2 setting's default value is `False`.&lt;/br&gt;&lt;/br&gt;You can disable any of next ciphers by using settings `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA. For example, `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. The default value is `true` for them.
*
* @param customProperties the customProperties value to set
* @return the ApiManagementServiceUpdateParameters object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,14 @@ public ApiDiagnosticContract call(DiagnosticContractInner inner) {
public Observable<ApiDiagnosticContract> getAsync(String resourceGroupName, String serviceName, String apiId, String diagnosticId) {
ApiDiagnosticsInner client = this.inner();
return client.getAsync(resourceGroupName, serviceName, apiId, diagnosticId)
.map(new Func1<DiagnosticContractInner, ApiDiagnosticContract>() {
.flatMap(new Func1<DiagnosticContractInner, Observable<ApiDiagnosticContract>>() {
@Override
public ApiDiagnosticContract call(DiagnosticContractInner inner) {
return wrapModel(inner);
public Observable<ApiDiagnosticContract> call(DiagnosticContractInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((ApiDiagnosticContract)wrapModel(inner));
}
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,14 @@ public IssueAttachmentContract call(IssueAttachmentContractInner inner) {
public Observable<IssueAttachmentContract> getAsync(String resourceGroupName, String serviceName, String apiId, String issueId, String attachmentId) {
ApiIssueAttachmentsInner client = this.inner();
return client.getAsync(resourceGroupName, serviceName, apiId, issueId, attachmentId)
.map(new Func1<IssueAttachmentContractInner, IssueAttachmentContract>() {
.flatMap(new Func1<IssueAttachmentContractInner, Observable<IssueAttachmentContract>>() {
@Override
public IssueAttachmentContract call(IssueAttachmentContractInner inner) {
return wrapModel(inner);
public Observable<IssueAttachmentContract> call(IssueAttachmentContractInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((IssueAttachmentContract)wrapModel(inner));
}
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,14 @@ public IssueCommentContract call(IssueCommentContractInner inner) {
public Observable<IssueCommentContract> getAsync(String resourceGroupName, String serviceName, String apiId, String issueId, String commentId) {
ApiIssueCommentsInner client = this.inner();
return client.getAsync(resourceGroupName, serviceName, apiId, issueId, commentId)
.map(new Func1<IssueCommentContractInner, IssueCommentContract>() {
.flatMap(new Func1<IssueCommentContractInner, Observable<IssueCommentContract>>() {
@Override
public IssueCommentContract call(IssueCommentContractInner inner) {
return wrapModel(inner);
public Observable<IssueCommentContract> call(IssueCommentContractInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((IssueCommentContract)wrapModel(inner));
}
}
});
}
Expand Down
Loading