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 mgmt-v2019_09_01] Update keyvault.json #6786

Closed
wants to merge 1 commit into from
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
4 changes: 2 additions & 2 deletions sdk/keyvault/mgmt-v2019_09_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.3.2</version>
<relativePath>../../parents/azure-arm-parent/pom.xml</relativePath>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-keyvault</artifactId>
<version>1.0.0-beta</version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public class VaultProperties {
private List<AccessPolicyEntry> accessPolicies;

/**
* The URI of the vault for performing operations on keys and secrets.
* The URI of the vault for performing operations on keys and secrets. This
* property is readonly.
*/
@JsonProperty(value = "vaultUri")
private String vaultUri;
Expand Down Expand Up @@ -185,7 +186,7 @@ public VaultProperties withAccessPolicies(List<AccessPolicyEntry> accessPolicies
}

/**
* Get the URI of the vault for performing operations on keys and secrets.
* Get the URI of the vault for performing operations on keys and secrets. This property is readonly.
*
* @return the vaultUri value
*/
Expand All @@ -194,7 +195,7 @@ public String vaultUri() {
}

/**
* Set the URI of the vault for performing operations on keys and secrets.
* Set the URI of the vault for performing operations on keys and secrets. This property is readonly.
*
* @param vaultUri the vaultUri value to set
* @return the VaultProperties object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,6 @@ public KeyVaultManagementClientImpl withGenerateClientRequestId(boolean generate
return this;
}

/**
* The OperationsInner object to access its operations.
*/
private OperationsInner operations;

/**
* Gets the OperationsInner object to access its operations.
* @return the OperationsInner object.
*/
public OperationsInner operations() {
return this.operations;
}

/**
* The VaultsInner object to access its operations.
*/
Expand Down Expand Up @@ -184,6 +171,19 @@ public PrivateLinkResourcesInner privateLinkResources() {
return this.privateLinkResources;
}

/**
* The OperationsInner object to access its operations.
*/
private OperationsInner operations;

/**
* Gets the OperationsInner object to access its operations.
* @return the OperationsInner object.
*/
public OperationsInner operations() {
return this.operations;
}

/**
* The SecretsInner object to access its operations.
*/
Expand Down Expand Up @@ -232,10 +232,10 @@ protected void initialize() {
this.acceptLanguage = "en-US";
this.longRunningOperationRetryTimeout = 30;
this.generateClientRequestId = true;
this.operations = new OperationsInner(restClient().retrofit(), this);
this.vaults = new VaultsInner(restClient().retrofit(), this);
this.privateEndpointConnections = new PrivateEndpointConnectionsInner(restClient().retrofit(), this);
this.privateLinkResources = new PrivateLinkResourcesInner(restClient().retrofit(), this);
this.operations = new OperationsInner(restClient().retrofit(), this);
this.secrets = new SecretsInner(restClient().retrofit(), this);
this.azureClient = new AzureClient(this);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
import com.microsoft.azure.arm.resources.AzureConfigurable;
import com.microsoft.azure.serializer.AzureJacksonAdapter;
import com.microsoft.rest.RestClient;
import com.microsoft.azure.management.keyvault.v2019_09_01.Operations;
import com.microsoft.azure.management.keyvault.v2019_09_01.Vaults;
import com.microsoft.azure.management.keyvault.v2019_09_01.PrivateEndpointConnections;
import com.microsoft.azure.management.keyvault.v2019_09_01.PrivateLinkResources;
import com.microsoft.azure.management.keyvault.v2019_09_01.Operations;
import com.microsoft.azure.management.keyvault.v2019_09_01.Secrets;
import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
import com.microsoft.azure.arm.resources.implementation.ManagerCore;
Expand All @@ -28,10 +28,10 @@
* Entry point to Azure KeyVault resource management.
*/
public final class KeyVaultManager extends ManagerCore<KeyVaultManager, KeyVaultManagementClientImpl> {
private Operations operations;
private Vaults vaults;
private PrivateEndpointConnections privateEndpointConnections;
private PrivateLinkResources privateLinkResources;
private Operations operations;
private Secrets secrets;
/**
* Get a Configurable instance that can be used to create KeyVaultManager with optional configuration.
Expand Down Expand Up @@ -80,16 +80,6 @@ public interface Configurable extends AzureConfigurable<Configurable> {
KeyVaultManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
}

/**
* @return Entry point to manage Operations.
*/
public Operations operations() {
if (this.operations == null) {
this.operations = new OperationsImpl(this);
}
return this.operations;
}

/**
* @return Entry point to manage Vaults.
*/
Expand Down Expand Up @@ -120,6 +110,16 @@ public PrivateLinkResources privateLinkResources() {
return this.privateLinkResources;
}

/**
* @return Entry point to manage Operations.
*/
public Operations operations() {
if (this.operations == null) {
this.operations = new OperationsImpl(this);
}
return this.operations;
}

/**
* @return Entry point to manage Secrets.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

package com.microsoft.azure.management.keyvault.v2019_09_01.implementation;

import com.microsoft.azure.management.keyvault.v2019_09_01.AccessPolicyUpdateKind;
import com.microsoft.azure.management.keyvault.v2019_09_01.VaultAccessPolicyParameters;
import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
import rx.Observable;
Expand All @@ -27,14 +26,16 @@ class VaultAccessPolicyParametersImpl extends CreatableUpdatableImpl<VaultAccess
super(name, new VaultAccessPolicyParametersInner());
this.manager = manager;
// Set resource name
this.operationKind = AccessPolicyUpdateKind.fromString(name);
this.operationKind = name;
//
this.uproperties = new VaultAccessPolicyProperties();
}

VaultAccessPolicyParametersImpl(VaultAccessPolicyParametersInner inner, KeyVaultManager manager) {
super(inner.name(), inner);
this.manager = manager;
// Set resource name
this.operationKind = inner.name();
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.vaultName = IdParsingUtils.getValueFromIdByName(inner.id(), "vaults");
Expand Down