From 1a62dc801c8852ae9ab4ad836880d03f03c8abb3 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 24 Jul 2018 16:55:46 +0000 Subject: [PATCH] Generated from a03d1c0cfac6c0d9dd15b1917b6fe074c86e2fa1 [AKS] remove "KeyVaultSecretRef" and rename to "ManagedClusterServicePrincipalProfile" --- .../mgmt/containerservice/models.go | 1 + .../2018-03-31/containerservice/managedclusters.go | 7 +------ .../mgmt/2018-03-31/containerservice/models.go | 13 +++++++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/profiles/preview/containerservice/mgmt/containerservice/models.go b/profiles/preview/containerservice/mgmt/containerservice/models.go index 12747e0d2930..8832ad448518 100644 --- a/profiles/preview/containerservice/mgmt/containerservice/models.go +++ b/profiles/preview/containerservice/mgmt/containerservice/models.go @@ -268,6 +268,7 @@ type ManagedClusterPoolUpgradeProfile = original.ManagedClusterPoolUpgradeProfil type ManagedClusterProperties = original.ManagedClusterProperties type ManagedClustersCreateOrUpdateFuture = original.ManagedClustersCreateOrUpdateFuture type ManagedClustersDeleteFuture = original.ManagedClustersDeleteFuture +type ManagedClusterServicePrincipalProfile = original.ManagedClusterServicePrincipalProfile type ManagedClustersUpdateTagsFuture = original.ManagedClustersUpdateTagsFuture type ManagedClusterUpgradeProfile = original.ManagedClusterUpgradeProfile type ManagedClusterUpgradeProfileProperties = original.ManagedClusterUpgradeProfileProperties diff --git a/services/containerservice/mgmt/2018-03-31/containerservice/managedclusters.go b/services/containerservice/mgmt/2018-03-31/containerservice/managedclusters.go index da59cf33e70f..7f71f13e92e3 100644 --- a/services/containerservice/mgmt/2018-03-31/containerservice/managedclusters.go +++ b/services/containerservice/mgmt/2018-03-31/containerservice/managedclusters.go @@ -57,12 +57,7 @@ func (client ManagedClustersClient) CreateOrUpdate(ctx context.Context, resource Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.LinuxProfile.SSH.PublicKeys", Name: validation.Null, Rule: true, Chain: nil}}}, }}, {Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile.ClientID", Name: validation.Null, Rule: true, Chain: nil}, - {Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile.KeyVaultSecretRef", Name: validation.Null, Rule: false, - Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile.KeyVaultSecretRef.VaultID", Name: validation.Null, Rule: true, Chain: nil}, - {Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile.KeyVaultSecretRef.SecretName", Name: validation.Null, Rule: true, Chain: nil}, - }}, - }}, + Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.ServicePrincipalProfile.ClientID", Name: validation.Null, Rule: true, Chain: nil}}}, {Target: "parameters.ManagedClusterProperties.NetworkProfile", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.NetworkProfile.PodCidr", Name: validation.Null, Rule: false, Chain: []validation.Constraint{{Target: "parameters.ManagedClusterProperties.NetworkProfile.PodCidr", Name: validation.Pattern, Rule: `^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$`, Chain: nil}}}, diff --git a/services/containerservice/mgmt/2018-03-31/containerservice/models.go b/services/containerservice/mgmt/2018-03-31/containerservice/models.go index ba39aa50ca0c..69e973919bd1 100644 --- a/services/containerservice/mgmt/2018-03-31/containerservice/models.go +++ b/services/containerservice/mgmt/2018-03-31/containerservice/models.go @@ -1193,8 +1193,8 @@ type ManagedClusterProperties struct { AgentPoolProfiles *[]ManagedClusterAgentPoolProfile `json:"agentPoolProfiles,omitempty"` // LinuxProfile - Profile for Linux VMs in the container service cluster. LinuxProfile *LinuxProfile `json:"linuxProfile,omitempty"` - // ServicePrincipalProfile - Information about a service principal identity for the cluster to use for manipulating Azure APIs. Either secret or keyVaultSecretRef must be specified. - ServicePrincipalProfile *ServicePrincipalProfile `json:"servicePrincipalProfile,omitempty"` + // ServicePrincipalProfile - Information about a service principal identity for the cluster to use for manipulating Azure APIs. + ServicePrincipalProfile *ManagedClusterServicePrincipalProfile `json:"servicePrincipalProfile,omitempty"` // AddonProfiles - Profile of managed cluster add-on. AddonProfiles map[string]*ManagedClusterAddonProfile `json:"addonProfiles"` // NodeResourceGroup - Name of the resource group containing agent pool nodes. @@ -1301,6 +1301,15 @@ func (future *ManagedClustersDeleteFuture) Result(client ManagedClustersClient) return } +// ManagedClusterServicePrincipalProfile information about a service principal identity for the cluster to use for +// manipulating Azure APIs. +type ManagedClusterServicePrincipalProfile struct { + // ClientID - The ID for the service principal. + ClientID *string `json:"clientId,omitempty"` + // Secret - The secret password associated with the service principal in plain text. + Secret *string `json:"secret,omitempty"` +} + // ManagedClustersUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ManagedClustersUpdateTagsFuture struct {