Skip to content

[AutoPR keyvault/data-plane/keyvault/resource-manager] [Keyvault] Merging keyvault_preview into master for 7.0 / 2018-02-14 release #2122

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.

Sign up for GitHub

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

Merged
jhendrixMSFT merged 10 commits into from
Jun 28, 2018
Merged

[AutoPR keyvault/data-plane/keyvault/resource-manager] [Keyvault] Merging keyvault_preview into master for 7.0 / 2018-02-14 release #2122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d238b2e
Generated from 098a49e739cd391bc3b18058f7085bdde878eb1a
AutorestCI Jun 8, 2018
a7c4064
Generated from a8716487c7fd1650e10fd5c98cc43c927dc91a00 (#1995)
AutorestCI Jun 8, 2018
5bc40bb
Generated from 9369266446042df81c805ddb203079cf98e939fb (#1994)
AutorestCI Jun 8, 2018
395d1be
Generated from 45eef2477d9961e82069ed3d847ed729c7354a41
AutorestCI Jun 20, 2018
639c91a
Generated from b5dc60ee8947a4fd2cc3f2db659d3017ca3fbded (#2087)
AutorestCI Jun 20, 2018
fc15093
Generated from 71e350e36bda5ddadf9f08c5fd7195c65a3d48c1 (#2088)
AutorestCI Jun 21, 2018
70d80aa
Generated from 57fd9306b5ab91393d9b60f05ccc6c0d311e21fa
AutorestCI Jun 22, 2018
8be1546
Generated from e560fd1b8e44a9e90f7f7f19aa9880736a5e3b7b
AutorestCI Jun 22, 2018
b416245
Generated from 8acad9d35e1ca7bbf7d4a3584e20a0d16a06c0ef (#2105)
AutorestCI Jun 22, 2018
57ad0b0
[AutoPR keyvault/resource-manager/keyvault/data-plane] Moving 2018-02…
AutorestCI Jun 26, 2018
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
28 changes: 27 additions & 1 deletion profiles/preview/keyvault/mgmt/keyvault/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package keyvault

import original "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault"
import original "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault"

const (
DefaultBaseURI = original.DefaultBaseURI
Expand All @@ -37,6 +37,7 @@ const (
type CertificatePermissions = original.CertificatePermissions

const (
Backup CertificatePermissions = original.Backup
Create CertificatePermissions = original.Create
Delete CertificatePermissions = original.Delete
Deleteissuers CertificatePermissions = original.Deleteissuers
Expand All @@ -49,6 +50,7 @@ const (
Manageissuers CertificatePermissions = original.Manageissuers
Purge CertificatePermissions = original.Purge
Recover CertificatePermissions = original.Recover
Restore CertificatePermissions = original.Restore
Setissuers CertificatePermissions = original.Setissuers
Update CertificatePermissions = original.Update
)
Expand Down Expand Up @@ -81,6 +83,20 @@ const (
KeyPermissionsWrapKey KeyPermissions = original.KeyPermissionsWrapKey
)

type NetworkRuleAction = original.NetworkRuleAction

const (
Allow NetworkRuleAction = original.Allow
Deny NetworkRuleAction = original.Deny
)

type NetworkRuleBypassOptions = original.NetworkRuleBypassOptions

const (
AzureServices NetworkRuleBypassOptions = original.AzureServices
None NetworkRuleBypassOptions = original.None
)

type Reason = original.Reason

const (
Expand Down Expand Up @@ -134,7 +150,9 @@ type DeletedVaultListResult = original.DeletedVaultListResult
type DeletedVaultListResultIterator = original.DeletedVaultListResultIterator
type DeletedVaultListResultPage = original.DeletedVaultListResultPage
type DeletedVaultProperties = original.DeletedVaultProperties
type IPRule = original.IPRule
type LogSpecification = original.LogSpecification
type NetworkRuleSet = original.NetworkRuleSet
type Operation = original.Operation
type OperationDisplay = original.OperationDisplay
type OperationListResult = original.OperationListResult
Expand All @@ -159,7 +177,9 @@ type VaultListResultPage = original.VaultListResultPage
type VaultPatchParameters = original.VaultPatchParameters
type VaultPatchProperties = original.VaultPatchProperties
type VaultProperties = original.VaultProperties
type VaultsCreateOrUpdateFuture = original.VaultsCreateOrUpdateFuture
type VaultsPurgeDeletedFuture = original.VaultsPurgeDeletedFuture
type VirtualNetworkRule = original.VirtualNetworkRule
type OperationsClient = original.OperationsClient
type VaultsClient = original.VaultsClient

Expand All @@ -181,6 +201,12 @@ func PossibleCreateModeValues() []CreateMode {
func PossibleKeyPermissionsValues() []KeyPermissions {
return original.PossibleKeyPermissionsValues()
}
func PossibleNetworkRuleActionValues() []NetworkRuleAction {
return original.PossibleNetworkRuleActionValues()
}
func PossibleNetworkRuleBypassOptionsValues() []NetworkRuleBypassOptions {
return original.PossibleNetworkRuleBypassOptionsValues()
}
func PossibleReasonValues() []Reason {
return original.PossibleReasonValues()
}
Expand Down
32 changes: 17 additions & 15 deletions profiles/preview/preview/keyvault/keyvault/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ const (
type JSONWebKeyCurveName = original.JSONWebKeyCurveName

const (
P256 JSONWebKeyCurveName = original.P256
P384 JSONWebKeyCurveName = original.P384
P521 JSONWebKeyCurveName = original.P521
SECP256K1 JSONWebKeyCurveName = original.SECP256K1
P256 JSONWebKeyCurveName = original.P256
P256K JSONWebKeyCurveName = original.P256K
P384 JSONWebKeyCurveName = original.P384
P521 JSONWebKeyCurveName = original.P521
)

type JSONWebKeyEncryptionAlgorithm = original.JSONWebKeyEncryptionAlgorithm
Expand All @@ -69,17 +69,17 @@ const (
type JSONWebKeySignatureAlgorithm = original.JSONWebKeySignatureAlgorithm

const (
ECDSA256 JSONWebKeySignatureAlgorithm = original.ECDSA256
ES256 JSONWebKeySignatureAlgorithm = original.ES256
ES384 JSONWebKeySignatureAlgorithm = original.ES384
ES512 JSONWebKeySignatureAlgorithm = original.ES512
PS256 JSONWebKeySignatureAlgorithm = original.PS256
PS384 JSONWebKeySignatureAlgorithm = original.PS384
PS512 JSONWebKeySignatureAlgorithm = original.PS512
RS256 JSONWebKeySignatureAlgorithm = original.RS256
RS384 JSONWebKeySignatureAlgorithm = original.RS384
RS512 JSONWebKeySignatureAlgorithm = original.RS512
RSNULL JSONWebKeySignatureAlgorithm = original.RSNULL
ES256 JSONWebKeySignatureAlgorithm = original.ES256
ES256K JSONWebKeySignatureAlgorithm = original.ES256K
ES384 JSONWebKeySignatureAlgorithm = original.ES384
ES512 JSONWebKeySignatureAlgorithm = original.ES512
PS256 JSONWebKeySignatureAlgorithm = original.PS256
PS384 JSONWebKeySignatureAlgorithm = original.PS384
PS512 JSONWebKeySignatureAlgorithm = original.PS512
RS256 JSONWebKeySignatureAlgorithm = original.RS256
RS384 JSONWebKeySignatureAlgorithm = original.RS384
RS512 JSONWebKeySignatureAlgorithm = original.RS512
RSNULL JSONWebKeySignatureAlgorithm = original.RSNULL
)

type JSONWebKeyType = original.JSONWebKeyType
Expand Down Expand Up @@ -116,6 +116,7 @@ const (
type Action = original.Action
type AdministratorDetails = original.AdministratorDetails
type Attributes = original.Attributes
type BackupCertificateResult = original.BackupCertificateResult
type BackupKeyResult = original.BackupKeyResult
type BackupSecretResult = original.BackupSecretResult
type BackupStorageResult = original.BackupStorageResult
Expand All @@ -137,6 +138,7 @@ type CertificateMergeParameters = original.CertificateMergeParameters
type CertificateOperation = original.CertificateOperation
type CertificateOperationUpdateParameter = original.CertificateOperationUpdateParameter
type CertificatePolicy = original.CertificatePolicy
type CertificateRestoreParameters = original.CertificateRestoreParameters
type CertificateUpdateParameters = original.CertificateUpdateParameters
type Contact = original.Contact
type Contacts = original.Contacts
Expand Down
14 changes: 7 additions & 7 deletions services/keyvault/2015-06-01/keyvault/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions services/keyvault/2015-06-01/keyvault/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading