Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@

package com.microsoft.azure.management.keyvault;

import java.util.Collection;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.microsoft.rest.ExpandableStringEnum;

import java.util.Collection;

/**
* Defines values for KeyPermissions.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ public final class StoragePermissions extends ExpandableStringEnum<StoragePermis
/** Static value regeneratekey for StoragePermissions. */
public static final StoragePermissions REGENERATEKEY = fromString("regeneratekey");

/** Static value recover for StoragePermissions. */
public static final StoragePermissions RECOVER = fromString("recover");

/** Static value purge for StoragePermissions. */
public static final StoragePermissions PURGE = fromString("purge");

/** Static value backup for StoragePermissions. */
public static final StoragePermissions BACKUP = fromString("backup");

/** Static value restore for StoragePermissions. */
public static final StoragePermissions RESTORE = fromString("restore");

/** Static value setsas for StoragePermissions. */
public static final StoragePermissions SETSAS = fromString("setsas");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public class VaultPatchProperties {
private Boolean enabledForTemplateDeployment;

/**
* Property to specify whether the 'soft delete' functionality is enabled
* for this key vault. It does not accept false value.
* Property specifying whether recoverable deletion ('soft' delete) is
* enabled for this key vault. The property may not be set to false.
*/
@JsonProperty(value = "enableSoftDelete")
private Boolean enableSoftDelete;
Expand All @@ -72,6 +72,14 @@ public class VaultPatchProperties {
@JsonProperty(value = "createMode")
private CreateMode createMode;

/**
* Property specifying whether protection against purge is enabled for this
* vault; it is only effective if soft delete is also enabled. Once
* activated, the property may no longer be reset to false.
*/
@JsonProperty(value = "enablePurgeProtection")
private Boolean enablePurgeProtection;

/**
* Get the tenantId value.
*
Expand Down Expand Up @@ -232,4 +240,24 @@ public VaultPatchProperties withCreateMode(CreateMode createMode) {
return this;
}

/**
* Get the enablePurgeProtection value.
*
* @return the enablePurgeProtection value
*/
public Boolean enablePurgeProtection() {
return this.enablePurgeProtection;
}

/**
* Set the enablePurgeProtection value.
*
* @param enablePurgeProtection the enablePurgeProtection value to set
* @return the VaultPatchProperties object itself.
*/
public VaultPatchProperties withEnablePurgeProtection(Boolean enablePurgeProtection) {
this.enablePurgeProtection = enablePurgeProtection;
return this;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class VaultProperties {
/**
* The URI of the vault for performing operations on keys and secrets.
*/
@JsonProperty(value = "vaultUri", access = JsonProperty.Access.WRITE_ONLY)
@JsonProperty(value = "vaultUri")
private String vaultUri;

/**
Expand All @@ -65,8 +65,11 @@ public class VaultProperties {
private Boolean enabledForTemplateDeployment;

/**
* Property to specify whether the 'soft delete' functionality is enabled
* for this key vault. It does not accept false value.
* Property specifying whether recoverable deletion is enabled for this key
* vault. Setting this property to true activates the soft delete feature,
* whereby vaults or vault entities can be recovered after deletion.
* Enabling this functionality is irreversible - that is, the property does
* not accept false as its value.
*/
@JsonProperty(value = "enableSoftDelete")
private Boolean enableSoftDelete;
Expand All @@ -78,6 +81,17 @@ public class VaultProperties {
@JsonProperty(value = "createMode")
private CreateMode createMode;

/**
* Property specifying whether protection against purge is enabled for this
* vault. Setting this property to true activates protection against purge
* for this vault and its content - only the Key Vault service may initiate
* a hard, irrecoverable deletion. The setting is effective only if soft
* delete is also enabled. Enabling this functionality is irreversible -
* that is, the property does not accept false as its value.
*/
@JsonProperty(value = "enablePurgeProtection")
private Boolean enablePurgeProtection;

/**
* Get the tenantId value.
*
Expand Down Expand Up @@ -147,6 +161,17 @@ public String vaultUri() {
return this.vaultUri;
}

/**
* Set the vaultUri value.
*
* @param vaultUri the vaultUri value to set
* @return the VaultProperties object itself.
*/
public VaultProperties withVaultUri(String vaultUri) {
this.vaultUri = vaultUri;
return this;
}

/**
* Get the enabledForDeployment value.
*
Expand Down Expand Up @@ -247,4 +272,24 @@ public VaultProperties withCreateMode(CreateMode createMode) {
return this;
}

/**
* Get the enablePurgeProtection value.
*
* @return the enablePurgeProtection value
*/
public Boolean enablePurgeProtection() {
return this.enablePurgeProtection;
}

/**
* Set the enablePurgeProtection value.
*
* @param enablePurgeProtection the enablePurgeProtection value to set
* @return the VaultProperties object itself.
*/
public VaultProperties withEnablePurgeProtection(Boolean enablePurgeProtection) {
this.enablePurgeProtection = enablePurgeProtection;
return this;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,40 +8,39 @@

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

import com.microsoft.azure.management.resources.fluentcore.collection.InnerSupportsGet;
import com.microsoft.azure.management.resources.fluentcore.collection.InnerSupportsDelete;
import retrofit2.Retrofit;
import com.google.common.reflect.TypeToken;
import com.microsoft.azure.AzureServiceFuture;
import com.microsoft.azure.CloudException;
import com.microsoft.azure.ListOperationCallback;
import com.microsoft.azure.management.keyvault.AccessPolicyUpdateKind;
import com.microsoft.azure.management.keyvault.VaultCheckNameAvailabilityParameters;
import com.microsoft.azure.Page;
import com.microsoft.azure.PagedList;
import com.microsoft.azure.Resource;
import com.microsoft.azure.management.keyvault.AccessPolicyUpdateKind;
import com.microsoft.azure.management.keyvault.VaultCheckNameAvailabilityParameters;
import com.microsoft.azure.management.resources.fluentcore.collection.InnerSupportsDelete;
import com.microsoft.azure.management.resources.fluentcore.collection.InnerSupportsGet;
import com.microsoft.rest.ServiceCallback;
import com.microsoft.rest.ServiceFuture;
import com.microsoft.rest.ServiceResponse;
import com.microsoft.rest.Validator;
import java.io.IOException;
import java.util.List;
import okhttp3.ResponseBody;
import retrofit2.Response;
import retrofit2.Retrofit;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.HTTP;
import retrofit2.http.Header;
import retrofit2.http.Headers;
import retrofit2.http.HTTP;
import retrofit2.http.PATCH;
import retrofit2.http.Path;
import retrofit2.http.POST;
import retrofit2.http.PUT;
import retrofit2.http.Path;
import retrofit2.http.Query;
import retrofit2.http.Url;
import rx.Observable;
import retrofit2.Response;
import rx.functions.Func1;

import java.io.IOException;
import java.util.List;
import rx.Observable;

/**
* An instance of this class provides access to all the operations defined
Expand Down