From 19b5ce137099379c418f2b47b68fef6474b8fb8e Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 21 Jun 2021 06:21:06 +0000 Subject: [PATCH] CodeGen from PR 14763 in Azure/azure-rest-api-specs Added FPGA and GPU Node type family for all stable versions (#14763) * Added FPGA and GPU Node type family for all stable versions Added FPGA and GPU Node type family for all stable versions * adding node size family for 2021-04-01-preview Co-authored-by: Sai-Kumar-1901 --- .../CHANGELOG.md | 3 +- .../azure-resourcemanager-synapse/README.md | 6 +- .../azure-resourcemanager-synapse/pom.xml | 141 +++++++------ .../synapse/SynapseManager.java | 22 +- ...pointConnectionsPrivateLinkHubsClient.java | 32 +++ .../synapse/fluent/models/WorkspaceInner.java | 36 +++- ...tConnectionsPrivateLinkHubsClientImpl.java | 189 ++++++++++++++++++ ...ndpointConnectionsPrivateLinkHubsImpl.java | 30 +++ .../SynapseManagementClientImpl.java | 2 +- .../synapse/implementation/WorkspaceImpl.java | 10 + .../models/CspWorkspaceAdminProperties.java | 50 +++++ .../models/CustomerManagedKeyDetails.java | 29 +++ .../synapse/models/KekIdentityProperties.java | 76 +++++++ .../synapse/models/NodeSizeFamily.java | 6 + ...ateEndpointConnectionsPrivateLinkHubs.java | 30 +++ .../synapse/models/Workspace.java | 31 ++- .../synapse/models/WorkspacePatchInfo.java | 6 +- 17 files changed, 617 insertions(+), 82 deletions(-) create mode 100644 sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/CspWorkspaceAdminProperties.java create mode 100644 sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/KekIdentityProperties.java diff --git a/sdk/synapse/azure-resourcemanager-synapse/CHANGELOG.md b/sdk/synapse/azure-resourcemanager-synapse/CHANGELOG.md index a1d5fccf8675..8148eeac174e 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/CHANGELOG.md +++ b/sdk/synapse/azure-resourcemanager-synapse/CHANGELOG.md @@ -1,7 +1,8 @@ # Release History -## 1.0.0-beta.2 (Unreleased) +## 1.0.0-beta.1 (2021-06-21) +- Azure Resource Manager Synapse client library for Java. This package contains Microsoft Azure SDK for Synapse Management SDK. Azure Synapse Analytics Management Client. Package tag package-2021-05. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt). ## 1.0.0-beta.1 (2021-04-07) diff --git a/sdk/synapse/azure-resourcemanager-synapse/README.md b/sdk/synapse/azure-resourcemanager-synapse/README.md index 7e08dad4f28e..0791910619c8 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/README.md +++ b/sdk/synapse/azure-resourcemanager-synapse/README.md @@ -2,7 +2,7 @@ Azure Resource Manager Synapse client library for Java. -This package contains Microsoft Azure SDK for Synapse Management SDK. Azure Synapse Analytics Management Client. Package tag package-2021-03. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt). +This package contains Microsoft Azure SDK for Synapse Management SDK. Azure Synapse Analytics Management Client. Package tag package-2021-05. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt). ## We'd love to hear your feedback @@ -32,7 +32,7 @@ Various documentation is available to help you get started com.azure.resourcemanager azure-resourcemanager-synapse - 1.0.0-beta.1 + 1.0.0-beta.2 ``` [//]: # ({x-version-update-end}) @@ -74,6 +74,8 @@ See [API design][design] for general introduction on design and key concepts on ## Examples + + ## Troubleshooting ## Next steps diff --git a/sdk/synapse/azure-resourcemanager-synapse/pom.xml b/sdk/synapse/azure-resourcemanager-synapse/pom.xml index 310f190eb80b..02788418b96f 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/pom.xml +++ b/sdk/synapse/azure-resourcemanager-synapse/pom.xml @@ -1,67 +1,86 @@ - 4.0.0 - - com.azure - azure-client-sdk-parent - 1.7.0 - ../../parents/azure-client-sdk-parent - + 4.0.0 + + com.azure + azure-client-sdk-parent + 1.7.0 + ../../parents/azure-client-sdk-parent + - com.azure.resourcemanager - azure-resourcemanager-synapse - 1.0.0-beta.2 - jar + com.azure.resourcemanager + azure-resourcemanager-synapse + 1.0.0-beta.2 + jar - Microsoft Azure SDK for Synapse Management - This package contains Microsoft Azure SDK for Synapse Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure Synapse Analytics Management Client. Package tag package-2021-03. - https://github.com/Azure/azure-sdk-for-java + Microsoft Azure SDK for Synapse Management + This package contains Microsoft Azure SDK for Synapse Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure Synapse Analytics Management Client. Package tag package-2021-05. + https://github.com/Azure/azure-sdk-for-java - - - The MIT License (MIT) - http://opensource.org/licenses/MIT - repo - - + + + The MIT License (MIT) + http://opensource.org/licenses/MIT + repo + + - - https://github.com/Azure/azure-sdk-for-java - scm:git:git@github.com:Azure/azure-sdk-for-java.git - scm:git:git@github.com:Azure/azure-sdk-for-java.git - HEAD - - - - microsoft - Microsoft - - - - UTF-8 - - - - - com.azure - azure-core - 1.17.0 - - - com.azure - azure-core-management - 1.3.0 - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.5 - - true - - - - + + https://github.com/Azure/azure-sdk-for-java + scm:git:git@github.com:Azure/azure-sdk-for-java.git + scm:git:git@github.com:Azure/azure-sdk-for-java.git + HEAD + + + + microsoft + Microsoft + + + + UTF-8 + + + + + com.azure + azure-core + 1.17.0 + + + com.azure + azure-core-management + 1.3.0 + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.5 + + true + + + + org.revapi + revapi-maven-plugin + 0.11.2 + + + + + java.method.addedToInterface + + + true + .* + com\.azure\.resourcemanager(\.[^.]+)+\.fluent(\.[^.]+)* + + + + + + + diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/SynapseManager.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/SynapseManager.java index 85a061fd04d6..97be3bdc9628 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/SynapseManager.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/SynapseManager.java @@ -9,7 +9,6 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.policy.AddDatePolicy; -import com.azure.core.http.policy.BearerTokenAuthenticationPolicy; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.http.policy.HttpLoggingPolicy; import com.azure.core.http.policy.HttpPipelinePolicy; @@ -17,6 +16,7 @@ import com.azure.core.http.policy.RequestIdPolicy; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy; import com.azure.core.management.profile.AzureProfile; import com.azure.core.util.Configuration; import com.azure.core.util.logging.ClientLogger; @@ -317,6 +317,7 @@ public static final class Configurable { private HttpClient httpClient; private HttpLogOptions httpLogOptions; private final List policies = new ArrayList<>(); + private final List scopes = new ArrayList<>(); private RetryPolicy retryPolicy; private Duration defaultPollInterval; @@ -356,6 +357,17 @@ public Configurable withPolicy(HttpPipelinePolicy policy) { return this; } + /** + * Adds the scope to permission sets. + * + * @param scope the scope. + * @return the configurable object itself. + */ + public Configurable withScope(String scope) { + this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null.")); + return this; + } + /** * Sets the retry policy to the HTTP pipeline. * @@ -412,6 +424,9 @@ public SynapseManager authenticate(TokenCredential credential, AzureProfile prof userAgentBuilder.append(" (auto-generated)"); } + if (scopes.isEmpty()) { + scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default"); + } if (retryPolicy == null) { retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS); } @@ -421,10 +436,7 @@ public SynapseManager authenticate(TokenCredential credential, AzureProfile prof HttpPolicyProviders.addBeforeRetryPolicies(policies); policies.add(retryPolicy); policies.add(new AddDatePolicy()); - policies - .add( - new BearerTokenAuthenticationPolicy( - credential, profile.getEnvironment().getManagementEndpoint() + "/.default")); + policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0]))); policies.addAll(this.policies); HttpPolicyProviders.addAfterRetryPolicies(policies); policies.add(new HttpLoggingPolicy(httpLogOptions)); diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/fluent/PrivateEndpointConnectionsPrivateLinkHubsClient.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/fluent/PrivateEndpointConnectionsPrivateLinkHubsClient.java index aaea5f3852f8..9635d0029a2d 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/fluent/PrivateEndpointConnectionsPrivateLinkHubsClient.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/fluent/PrivateEndpointConnectionsPrivateLinkHubsClient.java @@ -7,6 +7,7 @@ import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceMethod; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; import com.azure.core.util.Context; import com.azure.resourcemanager.synapse.fluent.models.PrivateEndpointConnectionForPrivateLinkHubInner; @@ -43,4 +44,35 @@ PagedIterable list( @ServiceMethod(returns = ReturnType.COLLECTION) PagedIterable list( String resourceGroupName, String privateLinkHubName, Context context); + + /** + * Get all PrivateEndpointConnection in the PrivateLinkHub by name. + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param privateLinkHubName Name of the privateLinkHub. + * @param privateEndpointConnectionName Name of the privateEndpointConnection. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return all PrivateEndpointConnection in the PrivateLinkHub by name. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + PrivateEndpointConnectionForPrivateLinkHubInner get( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName); + + /** + * Get all PrivateEndpointConnection in the PrivateLinkHub by name. + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param privateLinkHubName Name of the privateLinkHub. + * @param privateEndpointConnectionName Name of the privateEndpointConnection. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return all PrivateEndpointConnection in the PrivateLinkHub by name. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + Response getWithResponse( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName, Context context); } diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/fluent/models/WorkspaceInner.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/fluent/models/WorkspaceInner.java index 63e9a9904371..156f69dc3b65 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/fluent/models/WorkspaceInner.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/fluent/models/WorkspaceInner.java @@ -8,6 +8,7 @@ import com.azure.core.annotation.JsonFlatten; import com.azure.core.management.Resource; import com.azure.core.util.logging.ClientLogger; +import com.azure.resourcemanager.synapse.models.CspWorkspaceAdminProperties; import com.azure.resourcemanager.synapse.models.DataLakeStorageAccountDetails; import com.azure.resourcemanager.synapse.models.EncryptionDetails; import com.azure.resourcemanager.synapse.models.ManagedIdentity; @@ -136,11 +137,17 @@ public class WorkspaceInner extends Resource { private String adlaResourceId; /* - * Enable or Disable pubic network access to workspace + * Enable or Disable public network access to workspace */ @JsonProperty(value = "properties.publicNetworkAccess") private WorkspacePublicNetworkAccess publicNetworkAccess; + /* + * Initial workspace AAD admin properties for a CSP subscription + */ + @JsonProperty(value = "properties.cspWorkspaceAdminProperties") + private CspWorkspaceAdminProperties cspWorkspaceAdminProperties; + /** * Get the identity property: Identity of the workspace. * @@ -449,7 +456,7 @@ public String adlaResourceId() { } /** - * Get the publicNetworkAccess property: Enable or Disable pubic network access to workspace. + * Get the publicNetworkAccess property: Enable or Disable public network access to workspace. * * @return the publicNetworkAccess value. */ @@ -458,7 +465,7 @@ public WorkspacePublicNetworkAccess publicNetworkAccess() { } /** - * Set the publicNetworkAccess property: Enable or Disable pubic network access to workspace. + * Set the publicNetworkAccess property: Enable or Disable public network access to workspace. * * @param publicNetworkAccess the publicNetworkAccess value to set. * @return the WorkspaceInner object itself. @@ -468,6 +475,26 @@ public WorkspaceInner withPublicNetworkAccess(WorkspacePublicNetworkAccess publi return this; } + /** + * Get the cspWorkspaceAdminProperties property: Initial workspace AAD admin properties for a CSP subscription. + * + * @return the cspWorkspaceAdminProperties value. + */ + public CspWorkspaceAdminProperties cspWorkspaceAdminProperties() { + return this.cspWorkspaceAdminProperties; + } + + /** + * Set the cspWorkspaceAdminProperties property: Initial workspace AAD admin properties for a CSP subscription. + * + * @param cspWorkspaceAdminProperties the cspWorkspaceAdminProperties value to set. + * @return the WorkspaceInner object itself. + */ + public WorkspaceInner withCspWorkspaceAdminProperties(CspWorkspaceAdminProperties cspWorkspaceAdminProperties) { + this.cspWorkspaceAdminProperties = cspWorkspaceAdminProperties; + return this; + } + /** {@inheritDoc} */ @Override public WorkspaceInner withLocation(String location) { @@ -512,5 +539,8 @@ public void validate() { if (purviewConfiguration() != null) { purviewConfiguration().validate(); } + if (cspWorkspaceAdminProperties() != null) { + cspWorkspaceAdminProperties().validate(); + } } } diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/PrivateEndpointConnectionsPrivateLinkHubsClientImpl.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/PrivateEndpointConnectionsPrivateLinkHubsClientImpl.java index 67e4b452db13..94c55b12adf8 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/PrivateEndpointConnectionsPrivateLinkHubsClientImpl.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/PrivateEndpointConnectionsPrivateLinkHubsClientImpl.java @@ -82,6 +82,22 @@ Mono> get( + @HostParam("$host") String endpoint, + @QueryParam("api-version") String apiVersion, + @PathParam("subscriptionId") String subscriptionId, + @PathParam("resourceGroupName") String resourceGroupName, + @PathParam("privateLinkHubName") String privateLinkHubName, + @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName, + @HeaderParam("Accept") String accept, + Context context); + @Headers({"Content-Type: application/json"}) @Get("{nextLink}") @ExpectedResponses({200}) @@ -277,6 +293,179 @@ public PagedIterable list( return new PagedIterable<>(listAsync(resourceGroupName, privateLinkHubName, context)); } + /** + * Get all PrivateEndpointConnection in the PrivateLinkHub by name. + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param privateLinkHubName Name of the privateLinkHub. + * @param privateEndpointConnectionName Name of the privateEndpointConnection. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return all PrivateEndpointConnection in the PrivateLinkHub by name. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> getWithResponseAsync( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName) { + if (this.client.getEndpoint() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + if (this.client.getSubscriptionId() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getSubscriptionId() is required and cannot be null.")); + } + if (resourceGroupName == null) { + return Mono + .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.")); + } + if (privateLinkHubName == null) { + return Mono + .error(new IllegalArgumentException("Parameter privateLinkHubName is required and cannot be null.")); + } + if (privateEndpointConnectionName == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter privateEndpointConnectionName is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil + .withContext( + context -> + service + .get( + this.client.getEndpoint(), + this.client.getApiVersion(), + this.client.getSubscriptionId(), + resourceGroupName, + privateLinkHubName, + privateEndpointConnectionName, + accept, + context)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * Get all PrivateEndpointConnection in the PrivateLinkHub by name. + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param privateLinkHubName Name of the privateLinkHub. + * @param privateEndpointConnectionName Name of the privateEndpointConnection. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return all PrivateEndpointConnection in the PrivateLinkHub by name. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> getWithResponseAsync( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName, Context context) { + if (this.client.getEndpoint() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + if (this.client.getSubscriptionId() == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter this.client.getSubscriptionId() is required and cannot be null.")); + } + if (resourceGroupName == null) { + return Mono + .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.")); + } + if (privateLinkHubName == null) { + return Mono + .error(new IllegalArgumentException("Parameter privateLinkHubName is required and cannot be null.")); + } + if (privateEndpointConnectionName == null) { + return Mono + .error( + new IllegalArgumentException( + "Parameter privateEndpointConnectionName is required and cannot be null.")); + } + final String accept = "application/json"; + context = this.client.mergeContext(context); + return service + .get( + this.client.getEndpoint(), + this.client.getApiVersion(), + this.client.getSubscriptionId(), + resourceGroupName, + privateLinkHubName, + privateEndpointConnectionName, + accept, + context); + } + + /** + * Get all PrivateEndpointConnection in the PrivateLinkHub by name. + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param privateLinkHubName Name of the privateLinkHub. + * @param privateEndpointConnectionName Name of the privateEndpointConnection. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return all PrivateEndpointConnection in the PrivateLinkHub by name. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono getAsync( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName) { + return getWithResponseAsync(resourceGroupName, privateLinkHubName, privateEndpointConnectionName) + .flatMap( + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); + } + + /** + * Get all PrivateEndpointConnection in the PrivateLinkHub by name. + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param privateLinkHubName Name of the privateLinkHub. + * @param privateEndpointConnectionName Name of the privateEndpointConnection. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return all PrivateEndpointConnection in the PrivateLinkHub by name. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PrivateEndpointConnectionForPrivateLinkHubInner get( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName) { + return getAsync(resourceGroupName, privateLinkHubName, privateEndpointConnectionName).block(); + } + + /** + * Get all PrivateEndpointConnection in the PrivateLinkHub by name. + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param privateLinkHubName Name of the privateLinkHub. + * @param privateEndpointConnectionName Name of the privateEndpointConnection. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return all PrivateEndpointConnection in the PrivateLinkHub by name. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName, Context context) { + return getWithResponseAsync(resourceGroupName, privateLinkHubName, privateEndpointConnectionName, context) + .block(); + } + /** * Get the next page of items. * diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/PrivateEndpointConnectionsPrivateLinkHubsImpl.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/PrivateEndpointConnectionsPrivateLinkHubsImpl.java index bfc7787f4ae9..bb3d4c0a3b91 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/PrivateEndpointConnectionsPrivateLinkHubsImpl.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/PrivateEndpointConnectionsPrivateLinkHubsImpl.java @@ -5,6 +5,8 @@ package com.azure.resourcemanager.synapse.implementation; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.SimpleResponse; import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.synapse.fluent.PrivateEndpointConnectionsPrivateLinkHubsClient; @@ -44,6 +46,34 @@ public PagedIterable list( .mapPage(inner, inner1 -> new PrivateEndpointConnectionForPrivateLinkHubImpl(inner1, this.manager())); } + public PrivateEndpointConnectionForPrivateLinkHub get( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName) { + PrivateEndpointConnectionForPrivateLinkHubInner inner = + this.serviceClient().get(resourceGroupName, privateLinkHubName, privateEndpointConnectionName); + if (inner != null) { + return new PrivateEndpointConnectionForPrivateLinkHubImpl(inner, this.manager()); + } else { + return null; + } + } + + public Response getWithResponse( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName, Context context) { + Response inner = + this + .serviceClient() + .getWithResponse(resourceGroupName, privateLinkHubName, privateEndpointConnectionName, context); + if (inner != null) { + return new SimpleResponse<>( + inner.getRequest(), + inner.getStatusCode(), + inner.getHeaders(), + new PrivateEndpointConnectionForPrivateLinkHubImpl(inner.getValue(), this.manager())); + } else { + return null; + } + } + private PrivateEndpointConnectionsPrivateLinkHubsClient serviceClient() { return this.innerClient; } diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/SynapseManagementClientImpl.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/SynapseManagementClientImpl.java index b05f6fe9f364..66880c0b1a84 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/SynapseManagementClientImpl.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/SynapseManagementClientImpl.java @@ -928,7 +928,7 @@ public RestorableDroppedSqlPoolsClient getRestorableDroppedSqlPools() { this.defaultPollInterval = defaultPollInterval; this.subscriptionId = subscriptionId; this.endpoint = endpoint; - this.apiVersion = "2021-03-01"; + this.apiVersion = "2021-05-01"; this.bigDataPools = new BigDataPoolsClientImpl(this); this.operations = new OperationsClientImpl(this); this.ipFirewallRules = new IpFirewallRulesClientImpl(this); diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/WorkspaceImpl.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/WorkspaceImpl.java index 53ba61397c4c..8219574bd6f4 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/WorkspaceImpl.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/implementation/WorkspaceImpl.java @@ -8,6 +8,7 @@ import com.azure.core.util.Context; import com.azure.resourcemanager.synapse.fluent.models.PrivateEndpointConnectionInner; import com.azure.resourcemanager.synapse.fluent.models.WorkspaceInner; +import com.azure.resourcemanager.synapse.models.CspWorkspaceAdminProperties; import com.azure.resourcemanager.synapse.models.DataLakeStorageAccountDetails; import com.azure.resourcemanager.synapse.models.EncryptionDetails; import com.azure.resourcemanager.synapse.models.ManagedIdentity; @@ -147,6 +148,10 @@ public WorkspacePublicNetworkAccess publicNetworkAccess() { return this.innerModel().publicNetworkAccess(); } + public CspWorkspaceAdminProperties cspWorkspaceAdminProperties() { + return this.innerModel().cspWorkspaceAdminProperties(); + } + public Region region() { return Region.fromName(this.regionName()); } @@ -376,6 +381,11 @@ public WorkspaceImpl withPublicNetworkAccess(WorkspacePublicNetworkAccess public } } + public WorkspaceImpl withCspWorkspaceAdminProperties(CspWorkspaceAdminProperties cspWorkspaceAdminProperties) { + this.innerModel().withCspWorkspaceAdminProperties(cspWorkspaceAdminProperties); + return this; + } + private boolean isInCreateMode() { return this.innerModel().id() == null; } diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/CspWorkspaceAdminProperties.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/CspWorkspaceAdminProperties.java new file mode 100644 index 000000000000..385c71a19e30 --- /dev/null +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/CspWorkspaceAdminProperties.java @@ -0,0 +1,50 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.synapse.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.util.logging.ClientLogger; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Initial workspace AAD admin properties for a CSP subscription. */ +@Fluent +public final class CspWorkspaceAdminProperties { + @JsonIgnore private final ClientLogger logger = new ClientLogger(CspWorkspaceAdminProperties.class); + + /* + * AAD object ID of initial workspace admin + */ + @JsonProperty(value = "initialWorkspaceAdminObjectId") + private String initialWorkspaceAdminObjectId; + + /** + * Get the initialWorkspaceAdminObjectId property: AAD object ID of initial workspace admin. + * + * @return the initialWorkspaceAdminObjectId value. + */ + public String initialWorkspaceAdminObjectId() { + return this.initialWorkspaceAdminObjectId; + } + + /** + * Set the initialWorkspaceAdminObjectId property: AAD object ID of initial workspace admin. + * + * @param initialWorkspaceAdminObjectId the initialWorkspaceAdminObjectId value to set. + * @return the CspWorkspaceAdminProperties object itself. + */ + public CspWorkspaceAdminProperties withInitialWorkspaceAdminObjectId(String initialWorkspaceAdminObjectId) { + this.initialWorkspaceAdminObjectId = initialWorkspaceAdminObjectId; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + } +} diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/CustomerManagedKeyDetails.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/CustomerManagedKeyDetails.java index 02d3c10a330c..5da6207d67e8 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/CustomerManagedKeyDetails.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/CustomerManagedKeyDetails.java @@ -26,6 +26,12 @@ public final class CustomerManagedKeyDetails { @JsonProperty(value = "key") private WorkspaceKeyDetails key; + /* + * Key encryption key + */ + @JsonProperty(value = "kekIdentity") + private KekIdentityProperties kekIdentity; + /** * Get the status property: The customer managed key status on the workspace. * @@ -55,6 +61,26 @@ public CustomerManagedKeyDetails withKey(WorkspaceKeyDetails key) { return this; } + /** + * Get the kekIdentity property: Key encryption key. + * + * @return the kekIdentity value. + */ + public KekIdentityProperties kekIdentity() { + return this.kekIdentity; + } + + /** + * Set the kekIdentity property: Key encryption key. + * + * @param kekIdentity the kekIdentity value to set. + * @return the CustomerManagedKeyDetails object itself. + */ + public CustomerManagedKeyDetails withKekIdentity(KekIdentityProperties kekIdentity) { + this.kekIdentity = kekIdentity; + return this; + } + /** * Validates the instance. * @@ -64,5 +90,8 @@ public void validate() { if (key() != null) { key().validate(); } + if (kekIdentity() != null) { + kekIdentity().validate(); + } } } diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/KekIdentityProperties.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/KekIdentityProperties.java new file mode 100644 index 000000000000..c09adc10219e --- /dev/null +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/KekIdentityProperties.java @@ -0,0 +1,76 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.synapse.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.util.logging.ClientLogger; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** Key encryption key properties. */ +@Fluent +public final class KekIdentityProperties { + @JsonIgnore private final ClientLogger logger = new ClientLogger(KekIdentityProperties.class); + + /* + * User assigned identity resource Id + */ + @JsonProperty(value = "userAssignedIdentity") + private String userAssignedIdentity; + + /* + * Boolean specifying whether to use system assigned identity or not + */ + @JsonProperty(value = "useSystemAssignedIdentity") + private Object useSystemAssignedIdentity; + + /** + * Get the userAssignedIdentity property: User assigned identity resource Id. + * + * @return the userAssignedIdentity value. + */ + public String userAssignedIdentity() { + return this.userAssignedIdentity; + } + + /** + * Set the userAssignedIdentity property: User assigned identity resource Id. + * + * @param userAssignedIdentity the userAssignedIdentity value to set. + * @return the KekIdentityProperties object itself. + */ + public KekIdentityProperties withUserAssignedIdentity(String userAssignedIdentity) { + this.userAssignedIdentity = userAssignedIdentity; + return this; + } + + /** + * Get the useSystemAssignedIdentity property: Boolean specifying whether to use system assigned identity or not. + * + * @return the useSystemAssignedIdentity value. + */ + public Object useSystemAssignedIdentity() { + return this.useSystemAssignedIdentity; + } + + /** + * Set the useSystemAssignedIdentity property: Boolean specifying whether to use system assigned identity or not. + * + * @param useSystemAssignedIdentity the useSystemAssignedIdentity value to set. + * @return the KekIdentityProperties object itself. + */ + public KekIdentityProperties withUseSystemAssignedIdentity(Object useSystemAssignedIdentity) { + this.useSystemAssignedIdentity = useSystemAssignedIdentity; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + } +} diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/NodeSizeFamily.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/NodeSizeFamily.java index 3a99921b144e..4f2d43c5d50c 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/NodeSizeFamily.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/NodeSizeFamily.java @@ -16,6 +16,12 @@ public final class NodeSizeFamily extends ExpandableStringEnum { /** Static value MemoryOptimized for NodeSizeFamily. */ public static final NodeSizeFamily MEMORY_OPTIMIZED = fromString("MemoryOptimized"); + /** Static value HardwareAcceleratedFPGA for NodeSizeFamily. */ + public static final NodeSizeFamily HARDWARE_ACCELERATED_FPGA = fromString("HardwareAcceleratedFPGA"); + + /** Static value HardwareAcceleratedGPU for NodeSizeFamily. */ + public static final NodeSizeFamily HARDWARE_ACCELERATED_GPU = fromString("HardwareAcceleratedGPU"); + /** * Creates or finds a NodeSizeFamily from its string representation. * diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/PrivateEndpointConnectionsPrivateLinkHubs.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/PrivateEndpointConnectionsPrivateLinkHubs.java index af9e58d9a5b8..82ef6f3ccf9b 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/PrivateEndpointConnectionsPrivateLinkHubs.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/PrivateEndpointConnectionsPrivateLinkHubs.java @@ -5,6 +5,7 @@ package com.azure.resourcemanager.synapse.models; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; import com.azure.core.util.Context; /** Resource collection API of PrivateEndpointConnectionsPrivateLinkHubs. */ @@ -34,4 +35,33 @@ public interface PrivateEndpointConnectionsPrivateLinkHubs { */ PagedIterable list( String resourceGroupName, String privateLinkHubName, Context context); + + /** + * Get all PrivateEndpointConnection in the PrivateLinkHub by name. + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param privateLinkHubName Name of the privateLinkHub. + * @param privateEndpointConnectionName Name of the privateEndpointConnection. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return all PrivateEndpointConnection in the PrivateLinkHub by name. + */ + PrivateEndpointConnectionForPrivateLinkHub get( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName); + + /** + * Get all PrivateEndpointConnection in the PrivateLinkHub by name. + * + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param privateLinkHubName Name of the privateLinkHub. + * @param privateEndpointConnectionName Name of the privateEndpointConnection. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return all PrivateEndpointConnection in the PrivateLinkHub by name. + */ + Response getWithResponse( + String resourceGroupName, String privateLinkHubName, String privateEndpointConnectionName, Context context); } diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/Workspace.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/Workspace.java index 309877ce0226..47311d45cff8 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/Workspace.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/Workspace.java @@ -173,12 +173,19 @@ public interface Workspace { String adlaResourceId(); /** - * Gets the publicNetworkAccess property: Enable or Disable pubic network access to workspace. + * Gets the publicNetworkAccess property: Enable or Disable public network access to workspace. * * @return the publicNetworkAccess value. */ WorkspacePublicNetworkAccess publicNetworkAccess(); + /** + * Gets the cspWorkspaceAdminProperties property: Initial workspace AAD admin properties for a CSP subscription. + * + * @return the cspWorkspaceAdminProperties value. + */ + CspWorkspaceAdminProperties cspWorkspaceAdminProperties(); + /** * Gets the region of the resource. * @@ -259,7 +266,8 @@ interface WithCreate DefinitionStages.WithManagedVirtualNetworkSettings, DefinitionStages.WithWorkspaceRepositoryConfiguration, DefinitionStages.WithPurviewConfiguration, - DefinitionStages.WithPublicNetworkAccess { + DefinitionStages.WithPublicNetworkAccess, + DefinitionStages.WithCspWorkspaceAdminProperties { /** * Executes the create request. * @@ -427,13 +435,24 @@ interface WithPurviewConfiguration { /** The stage of the Workspace definition allowing to specify publicNetworkAccess. */ interface WithPublicNetworkAccess { /** - * Specifies the publicNetworkAccess property: Enable or Disable pubic network access to workspace. + * Specifies the publicNetworkAccess property: Enable or Disable public network access to workspace. * - * @param publicNetworkAccess Enable or Disable pubic network access to workspace. + * @param publicNetworkAccess Enable or Disable public network access to workspace. * @return the next definition stage. */ WithCreate withPublicNetworkAccess(WorkspacePublicNetworkAccess publicNetworkAccess); } + /** The stage of the Workspace definition allowing to specify cspWorkspaceAdminProperties. */ + interface WithCspWorkspaceAdminProperties { + /** + * Specifies the cspWorkspaceAdminProperties property: Initial workspace AAD admin properties for a CSP + * subscription. + * + * @param cspWorkspaceAdminProperties Initial workspace AAD admin properties for a CSP subscription. + * @return the next definition stage. + */ + WithCreate withCspWorkspaceAdminProperties(CspWorkspaceAdminProperties cspWorkspaceAdminProperties); + } } /** * Begins update for the Workspace resource. @@ -543,9 +562,9 @@ interface WithEncryption { /** The stage of the Workspace update allowing to specify publicNetworkAccess. */ interface WithPublicNetworkAccess { /** - * Specifies the publicNetworkAccess property: Enable or Disable pubic network access to workspace. + * Specifies the publicNetworkAccess property: Enable or Disable public network access to workspace. * - * @param publicNetworkAccess Enable or Disable pubic network access to workspace. + * @param publicNetworkAccess Enable or Disable public network access to workspace. * @return the next definition stage. */ Update withPublicNetworkAccess(WorkspacePublicNetworkAccess publicNetworkAccess); diff --git a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/WorkspacePatchInfo.java b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/WorkspacePatchInfo.java index 47c5bfd5a08d..852c7ac771f2 100644 --- a/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/WorkspacePatchInfo.java +++ b/sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/models/WorkspacePatchInfo.java @@ -66,7 +66,7 @@ public class WorkspacePatchInfo { private EncryptionDetails encryption; /* - * Enable or Disable pubic network access to workspace + * Enable or Disable public network access to workspace */ @JsonProperty(value = "properties.publicNetworkAccess") private WorkspacePublicNetworkAccess publicNetworkAccess; @@ -223,7 +223,7 @@ public WorkspacePatchInfo withEncryption(EncryptionDetails encryption) { } /** - * Get the publicNetworkAccess property: Enable or Disable pubic network access to workspace. + * Get the publicNetworkAccess property: Enable or Disable public network access to workspace. * * @return the publicNetworkAccess value. */ @@ -232,7 +232,7 @@ public WorkspacePublicNetworkAccess publicNetworkAccess() { } /** - * Set the publicNetworkAccess property: Enable or Disable pubic network access to workspace. + * Set the publicNetworkAccess property: Enable or Disable public network access to workspace. * * @param publicNetworkAccess the publicNetworkAccess value to set. * @return the WorkspacePatchInfo object itself.