diff --git a/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/ContainerServiceClient.cs b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/ContainerServiceClient.cs index 8ec676a4cb84..79b8567011fc 100644 --- a/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/ContainerServiceClient.cs +++ b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/ContainerServiceClient.cs @@ -360,7 +360,7 @@ private void Initialize() PrivateLinkResources = new PrivateLinkResourcesOperations(this); ResolvePrivateLinkServiceId = new ResolvePrivateLinkServiceIdOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2021-05-01"; + ApiVersion = "2021-07-01"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedCluster.cs b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedCluster.cs index 17ae58b44a5c..459e63efc010 100644 --- a/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedCluster.cs +++ b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedCluster.cs @@ -39,6 +39,11 @@ public ManagedCluster() /// Resource name /// Resource type /// Resource tags + /// The managed cluster SKU. + /// The extended location of the Virtual + /// Machine. + /// The identity of the managed cluster, if + /// configured. /// The current provisioning /// state. /// The Power State of the cluster. @@ -95,14 +100,14 @@ public ManagedCluster() /// disabled on the Managed Cluster. /// Configurations for provisioning the /// cluster with HTTP proxy servers. - /// The identity of the managed cluster, if - /// configured. - /// The managed cluster SKU. - /// The extended location of the Virtual - /// Machine. - public ManagedCluster(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), string provisioningState = default(string), PowerState powerState = default(PowerState), int? maxAgentPools = default(int?), string kubernetesVersion = default(string), string dnsPrefix = default(string), string fqdnSubdomain = default(string), string fqdn = default(string), string privateFQDN = default(string), string azurePortalFQDN = default(string), IList agentPoolProfiles = default(IList), ContainerServiceLinuxProfile linuxProfile = default(ContainerServiceLinuxProfile), ManagedClusterWindowsProfile windowsProfile = default(ManagedClusterWindowsProfile), ManagedClusterServicePrincipalProfile servicePrincipalProfile = default(ManagedClusterServicePrincipalProfile), IDictionary addonProfiles = default(IDictionary), ManagedClusterPodIdentityProfile podIdentityProfile = default(ManagedClusterPodIdentityProfile), string nodeResourceGroup = default(string), bool? enableRBAC = default(bool?), bool? enablePodSecurityPolicy = default(bool?), ContainerServiceNetworkProfile networkProfile = default(ContainerServiceNetworkProfile), ManagedClusterAADProfile aadProfile = default(ManagedClusterAADProfile), ManagedClusterAutoUpgradeProfile autoUpgradeProfile = default(ManagedClusterAutoUpgradeProfile), ManagedClusterPropertiesAutoScalerProfile autoScalerProfile = default(ManagedClusterPropertiesAutoScalerProfile), ManagedClusterAPIServerAccessProfile apiServerAccessProfile = default(ManagedClusterAPIServerAccessProfile), string diskEncryptionSetID = default(string), IDictionary identityProfile = default(IDictionary), IList privateLinkResources = default(IList), bool? disableLocalAccounts = default(bool?), ManagedClusterHTTPProxyConfig httpProxyConfig = default(ManagedClusterHTTPProxyConfig), ManagedClusterIdentity identity = default(ManagedClusterIdentity), ManagedClusterSKU sku = default(ManagedClusterSKU), ExtendedLocation extendedLocation = default(ExtendedLocation)) + /// Security profile for the managed + /// cluster. + public ManagedCluster(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), ManagedClusterSKU sku = default(ManagedClusterSKU), ExtendedLocation extendedLocation = default(ExtendedLocation), ManagedClusterIdentity identity = default(ManagedClusterIdentity), string provisioningState = default(string), PowerState powerState = default(PowerState), int? maxAgentPools = default(int?), string kubernetesVersion = default(string), string dnsPrefix = default(string), string fqdnSubdomain = default(string), string fqdn = default(string), string privateFQDN = default(string), string azurePortalFQDN = default(string), IList agentPoolProfiles = default(IList), ContainerServiceLinuxProfile linuxProfile = default(ContainerServiceLinuxProfile), ManagedClusterWindowsProfile windowsProfile = default(ManagedClusterWindowsProfile), ManagedClusterServicePrincipalProfile servicePrincipalProfile = default(ManagedClusterServicePrincipalProfile), IDictionary addonProfiles = default(IDictionary), ManagedClusterPodIdentityProfile podIdentityProfile = default(ManagedClusterPodIdentityProfile), string nodeResourceGroup = default(string), bool? enableRBAC = default(bool?), bool? enablePodSecurityPolicy = default(bool?), ContainerServiceNetworkProfile networkProfile = default(ContainerServiceNetworkProfile), ManagedClusterAADProfile aadProfile = default(ManagedClusterAADProfile), ManagedClusterAutoUpgradeProfile autoUpgradeProfile = default(ManagedClusterAutoUpgradeProfile), ManagedClusterPropertiesAutoScalerProfile autoScalerProfile = default(ManagedClusterPropertiesAutoScalerProfile), ManagedClusterAPIServerAccessProfile apiServerAccessProfile = default(ManagedClusterAPIServerAccessProfile), string diskEncryptionSetID = default(string), IDictionary identityProfile = default(IDictionary), IList privateLinkResources = default(IList), bool? disableLocalAccounts = default(bool?), ManagedClusterHTTPProxyConfig httpProxyConfig = default(ManagedClusterHTTPProxyConfig), ManagedClusterSecurityProfile securityProfile = default(ManagedClusterSecurityProfile)) : base(location, id, name, type, tags) { + Sku = sku; + ExtendedLocation = extendedLocation; + Identity = identity; ProvisioningState = provisioningState; PowerState = powerState; MaxAgentPools = maxAgentPools; @@ -131,9 +136,7 @@ public ManagedCluster() PrivateLinkResources = privateLinkResources; DisableLocalAccounts = disableLocalAccounts; HttpProxyConfig = httpProxyConfig; - Identity = identity; - Sku = sku; - ExtendedLocation = extendedLocation; + SecurityProfile = securityProfile; CustomInit(); } @@ -142,6 +145,24 @@ public ManagedCluster() /// partial void CustomInit(); + /// + /// Gets or sets the managed cluster SKU. + /// + [JsonProperty(PropertyName = "sku")] + public ManagedClusterSKU Sku { get; set; } + + /// + /// Gets or sets the extended location of the Virtual Machine. + /// + [JsonProperty(PropertyName = "extendedLocation")] + public ExtendedLocation ExtendedLocation { get; set; } + + /// + /// Gets or sets the identity of the managed cluster, if configured. + /// + [JsonProperty(PropertyName = "identity")] + public ManagedClusterIdentity Identity { get; set; } + /// /// Gets the current provisioning state. /// @@ -331,7 +352,7 @@ public ManagedCluster() /// Gets or sets identities associated with the cluster. /// [JsonProperty(PropertyName = "properties.identityProfile")] - public IDictionary IdentityProfile { get; set; } + public IDictionary IdentityProfile { get; set; } /// /// Gets or sets private link resources associated with the cluster. @@ -360,22 +381,10 @@ public ManagedCluster() public ManagedClusterHTTPProxyConfig HttpProxyConfig { get; set; } /// - /// Gets or sets the identity of the managed cluster, if configured. + /// Gets or sets security profile for the managed cluster. /// - [JsonProperty(PropertyName = "identity")] - public ManagedClusterIdentity Identity { get; set; } - - /// - /// Gets or sets the managed cluster SKU. - /// - [JsonProperty(PropertyName = "sku")] - public ManagedClusterSKU Sku { get; set; } - - /// - /// Gets or sets the extended location of the Virtual Machine. - /// - [JsonProperty(PropertyName = "extendedLocation")] - public ExtendedLocation ExtendedLocation { get; set; } + [JsonProperty(PropertyName = "properties.securityProfile")] + public ManagedClusterSecurityProfile SecurityProfile { get; set; } /// /// Validate the object. diff --git a/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedClusterPropertiesIdentityProfileValue.cs b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedClusterPropertiesIdentityProfileValue.cs deleted file mode 100644 index 6cbaf38bdcc8..000000000000 --- a/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedClusterPropertiesIdentityProfileValue.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.ContainerService.Models -{ - using System.Linq; - - public partial class ManagedClusterPropertiesIdentityProfileValue : UserAssignedIdentity - { - /// - /// Initializes a new instance of the - /// ManagedClusterPropertiesIdentityProfileValue class. - /// - public ManagedClusterPropertiesIdentityProfileValue() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the - /// ManagedClusterPropertiesIdentityProfileValue class. - /// - /// The resource ID of the user assigned - /// identity. - /// The client ID of the user assigned - /// identity. - /// The object ID of the user assigned - /// identity. - public ManagedClusterPropertiesIdentityProfileValue(string resourceId = default(string), string clientId = default(string), string objectId = default(string)) - : base(resourceId, clientId, objectId) - { - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - } -} diff --git a/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedClusterSecurityProfile.cs b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedClusterSecurityProfile.cs new file mode 100644 index 000000000000..aa5654dd20bc --- /dev/null +++ b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedClusterSecurityProfile.cs @@ -0,0 +1,54 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ContainerService.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Security profile for the container service cluster. + /// + public partial class ManagedClusterSecurityProfile + { + /// + /// Initializes a new instance of the ManagedClusterSecurityProfile + /// class. + /// + public ManagedClusterSecurityProfile() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ManagedClusterSecurityProfile + /// class. + /// + /// Azure Defender settings for the + /// security profile. + public ManagedClusterSecurityProfile(ManagedClusterSecurityProfileAzureDefender azureDefender = default(ManagedClusterSecurityProfileAzureDefender)) + { + AzureDefender = azureDefender; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets azure Defender settings for the security profile. + /// + [JsonProperty(PropertyName = "azureDefender")] + public ManagedClusterSecurityProfileAzureDefender AzureDefender { get; set; } + + } +} diff --git a/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedClusterSecurityProfileAzureDefender.cs b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedClusterSecurityProfileAzureDefender.cs new file mode 100644 index 000000000000..c5ed32338af1 --- /dev/null +++ b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/Models/ManagedClusterSecurityProfileAzureDefender.cs @@ -0,0 +1,68 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ContainerService.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Azure Defender settings for the security profile. + /// + public partial class ManagedClusterSecurityProfileAzureDefender + { + /// + /// Initializes a new instance of the + /// ManagedClusterSecurityProfileAzureDefender class. + /// + public ManagedClusterSecurityProfileAzureDefender() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// ManagedClusterSecurityProfileAzureDefender class. + /// + /// Whether to enable Azure Defender + /// Resource ID of the + /// Log Analytics workspace to be associated with Azure Defender. When + /// Azure Defender is enabled, this field is required and must be a + /// valid workspace resource ID. When Azure Defender is disabled, leave + /// the field empty. + public ManagedClusterSecurityProfileAzureDefender(bool? enabled = default(bool?), string logAnalyticsWorkspaceResourceId = default(string)) + { + Enabled = enabled; + LogAnalyticsWorkspaceResourceId = logAnalyticsWorkspaceResourceId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets whether to enable Azure Defender + /// + [JsonProperty(PropertyName = "enabled")] + public bool? Enabled { get; set; } + + /// + /// Gets or sets resource ID of the Log Analytics workspace to be + /// associated with Azure Defender. When Azure Defender is enabled, + /// this field is required and must be a valid workspace resource ID. + /// When Azure Defender is disabled, leave the field empty. + /// + [JsonProperty(PropertyName = "logAnalyticsWorkspaceResourceId")] + public string LogAnalyticsWorkspaceResourceId { get; set; } + + } +} diff --git a/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/SdkInfo_ContainerServiceClient.cs b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/SdkInfo_ContainerServiceClient.cs index 73e4ea9b5951..2e1751fbe30c 100644 --- a/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/SdkInfo_ContainerServiceClient.cs +++ b/sdk/containerservice/Microsoft.Azure.Management.ContainerService/src/Generated/SdkInfo_ContainerServiceClient.cs @@ -19,26 +19,15 @@ public static IEnumerable> ApiInfo_ContainerServic { return new Tuple[] { - new Tuple("ContainerService", "AgentPools", "2021-05-01"), - new Tuple("ContainerService", "MaintenanceConfigurations", "2021-05-01"), - new Tuple("ContainerService", "ManagedClusters", "2021-05-01"), - new Tuple("ContainerService", "Operations", "2021-05-01"), - new Tuple("ContainerService", "PrivateEndpointConnections", "2021-05-01"), - new Tuple("ContainerService", "PrivateLinkResources", "2021-05-01"), - new Tuple("ContainerService", "ResolvePrivateLinkServiceId", "2021-05-01"), + new Tuple("ContainerService", "AgentPools", "2021-07-01"), + new Tuple("ContainerService", "MaintenanceConfigurations", "2021-07-01"), + new Tuple("ContainerService", "ManagedClusters", "2021-07-01"), + new Tuple("ContainerService", "Operations", "2021-07-01"), + new Tuple("ContainerService", "PrivateEndpointConnections", "2021-07-01"), + new Tuple("ContainerService", "PrivateLinkResources", "2021-07-01"), + new Tuple("ContainerService", "ResolvePrivateLinkServiceId", "2021-07-01"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/containerservice/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\\Users\\kaiqz\\github\\kaiqzhan\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "b5b3ae9a081535b4dabce52a1136eece3e2d469f"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -