diff --git a/src/SDKs/ContainerRegistry/AzSdk.RP.props b/src/SDKs/ContainerRegistry/AzSdk.RP.props index 40a29e827277..f41e16c1bf08 100644 --- a/src/SDKs/ContainerRegistry/AzSdk.RP.props +++ b/src/SDKs/ContainerRegistry/AzSdk.RP.props @@ -1,7 +1,7 @@ - ContainerRegistry_2017-10-01;ContainerRegistry_2018-09-01; + ContainerRegistry_2017-10-01;ContainerRegistry_2019-04-01; $(PackageTags);$(CommonTags);$(AzureApiTag); \ No newline at end of file diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/CustomRegistryCredentials.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/CustomRegistryCredentials.cs index 34fdd55a5279..25ce66332ee6 100644 --- a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/CustomRegistryCredentials.cs +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/CustomRegistryCredentials.cs @@ -36,10 +36,20 @@ public CustomRegistryCredentials() /// registry. The password is a secret /// object that allows multiple ways of providing the value for /// it. - public CustomRegistryCredentials(SecretObject userName = default(SecretObject), SecretObject password = default(SecretObject)) + /// Indicates the managed identity assigned to + /// the custom credential. If a user-assigned identity + /// this value is the Client ID. If a system-assigned identity, the + /// value will be `system`. In + /// the case of a system-assigned identity, the Client ID will be + /// determined by the runner. This + /// identity may be used to authenticate to key vault to retreive + /// credentials or it may be the only + /// source of authentication used for accessing the registry. + public CustomRegistryCredentials(SecretObject userName = default(SecretObject), SecretObject password = default(SecretObject), string identity = default(string)) { UserName = userName; Password = password; + Identity = identity; CustomInit(); } @@ -62,5 +72,19 @@ public CustomRegistryCredentials() [JsonProperty(PropertyName = "password")] public SecretObject Password { get; set; } + /// + /// Gets or sets indicates the managed identity assigned to the custom + /// credential. If a user-assigned identity + /// this value is the Client ID. If a system-assigned identity, the + /// value will be `system`. In + /// the case of a system-assigned identity, the Client ID will be + /// determined by the runner. This + /// identity may be used to authenticate to key vault to retreive + /// credentials or it may be the only + /// source of authentication used for accessing the registry. + /// + [JsonProperty(PropertyName = "identity")] + public string Identity { get; set; } + } } diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/IdentityProperties.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/IdentityProperties.cs new file mode 100644 index 000000000000..b4328a2e79c1 --- /dev/null +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/IdentityProperties.cs @@ -0,0 +1,90 @@ +// +// 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.ContainerRegistry.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Managed identity for the resource. + /// + public partial class IdentityProperties + { + /// + /// Initializes a new instance of the IdentityProperties class. + /// + public IdentityProperties() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the IdentityProperties class. + /// + /// The principal ID of resource + /// identity. + /// The tenant ID of resource. + /// The identity type. Possible values include: + /// 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', + /// 'None' + /// The list of user identities + /// associated with the resource. The user identity + /// dictionary key references will be ARM resource ids in the form: + /// '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/ + /// providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + public IdentityProperties(string principalId = default(string), string tenantId = default(string), ResourceIdentityType? type = default(ResourceIdentityType?), IDictionary userAssignedIdentities = default(IDictionary)) + { + PrincipalId = principalId; + TenantId = tenantId; + Type = type; + UserAssignedIdentities = userAssignedIdentities; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the principal ID of resource identity. + /// + [JsonProperty(PropertyName = "principalId")] + public string PrincipalId { get; set; } + + /// + /// Gets or sets the tenant ID of resource. + /// + [JsonProperty(PropertyName = "tenantId")] + public string TenantId { get; set; } + + /// + /// Gets or sets the identity type. Possible values include: + /// 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', + /// 'None' + /// + [JsonProperty(PropertyName = "type")] + public ResourceIdentityType? Type { get; set; } + + /// + /// Gets or sets the list of user identities associated with the + /// resource. The user identity + /// dictionary key references will be ARM resource ids in the form: + /// '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/ + /// providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + /// + [JsonProperty(PropertyName = "userAssignedIdentities")] + public IDictionary UserAssignedIdentities { get; set; } + + } +} diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/ResourceIdentityType.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/ResourceIdentityType.cs new file mode 100644 index 000000000000..3aab5aa7140b --- /dev/null +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/ResourceIdentityType.cs @@ -0,0 +1,72 @@ +// +// 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.ContainerRegistry.Models +{ + using Newtonsoft.Json; + using Newtonsoft.Json.Converters; + using System.Runtime; + using System.Runtime.Serialization; + + /// + /// Defines values for ResourceIdentityType. + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum ResourceIdentityType + { + [EnumMember(Value = "SystemAssigned")] + SystemAssigned, + [EnumMember(Value = "UserAssigned")] + UserAssigned, + [EnumMember(Value = "SystemAssigned, UserAssigned")] + SystemAssignedUserAssigned, + [EnumMember(Value = "None")] + None + } + internal static class ResourceIdentityTypeEnumExtension + { + internal static string ToSerializedValue(this ResourceIdentityType? value) + { + return value == null ? null : ((ResourceIdentityType)value).ToSerializedValue(); + } + + internal static string ToSerializedValue(this ResourceIdentityType value) + { + switch( value ) + { + case ResourceIdentityType.SystemAssigned: + return "SystemAssigned"; + case ResourceIdentityType.UserAssigned: + return "UserAssigned"; + case ResourceIdentityType.SystemAssignedUserAssigned: + return "SystemAssigned, UserAssigned"; + case ResourceIdentityType.None: + return "None"; + } + return null; + } + + internal static ResourceIdentityType? ParseResourceIdentityType(this string value) + { + switch( value ) + { + case "SystemAssigned": + return ResourceIdentityType.SystemAssigned; + case "UserAssigned": + return ResourceIdentityType.UserAssigned; + case "SystemAssigned, UserAssigned": + return ResourceIdentityType.SystemAssignedUserAssigned; + case "None": + return ResourceIdentityType.None; + } + return null; + } + } +} diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/SecretObject.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/SecretObject.cs index 7a6f3b1bc18c..6479ac4fed92 100644 --- a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/SecretObject.cs +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/SecretObject.cs @@ -36,7 +36,8 @@ public SecretObject() /// used as is without any modification. /// The type of the secret object which determines /// how the value of the secret object has to be - /// interpreted. Possible values include: 'Opaque' + /// interpreted. Possible values include: 'Opaque', + /// 'Vaultsecret' public SecretObject(string value = default(string), string type = default(string)) { Value = value; @@ -62,7 +63,7 @@ public SecretObject() /// /// Gets or sets the type of the secret object which determines how the /// value of the secret object has to be - /// interpreted. Possible values include: 'Opaque' + /// interpreted. Possible values include: 'Opaque', 'Vaultsecret' /// [JsonProperty(PropertyName = "type")] public string Type { get; set; } diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/SecretObjectType.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/SecretObjectType.cs index cb8f90f1eb92..eb65d8737e16 100644 --- a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/SecretObjectType.cs +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/SecretObjectType.cs @@ -17,5 +17,6 @@ namespace Microsoft.Azure.Management.ContainerRegistry.Models public static class SecretObjectType { public const string Opaque = "Opaque"; + public const string Vaultsecret = "Vaultsecret"; } } diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/Task.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/Task.cs index c0f722e9adc2..ac5f23bb44a7 100644 --- a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/Task.cs +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/Task.cs @@ -44,6 +44,7 @@ public Task() /// The name of the resource. /// The type of the resource. /// The tags of the resource. + /// Identity for the resource. /// The provisioning state of the task. /// Possible values include: 'Creating', 'Updating', 'Deleting', /// 'Succeeded', 'Failed', 'Canceled' @@ -57,9 +58,10 @@ public Task() /// the task. /// The properties that describes a set of /// credentials that will be used when this run is invoked. - public Task(string location, PlatformProperties platform, TaskStepProperties step, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), string provisioningState = default(string), System.DateTime? creationDate = default(System.DateTime?), string status = default(string), AgentProperties agentConfiguration = default(AgentProperties), int? timeout = default(int?), TriggerProperties trigger = default(TriggerProperties), Credentials credentials = default(Credentials)) + public Task(string location, PlatformProperties platform, TaskStepProperties step, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), IdentityProperties identity = default(IdentityProperties), string provisioningState = default(string), System.DateTime? creationDate = default(System.DateTime?), string status = default(string), AgentProperties agentConfiguration = default(AgentProperties), int? timeout = default(int?), TriggerProperties trigger = default(TriggerProperties), Credentials credentials = default(Credentials)) : base(location, id, name, type, tags) { + Identity = identity; ProvisioningState = provisioningState; CreationDate = creationDate; Status = status; @@ -77,6 +79,12 @@ public Task() /// partial void CustomInit(); + /// + /// Gets or sets identity for the resource. + /// + [JsonProperty(PropertyName = "identity")] + public IdentityProperties Identity { get; set; } + /// /// Gets the provisioning state of the task. Possible values include: /// 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Failed', diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/TaskUpdateParameters.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/TaskUpdateParameters.cs index 91de6494181c..16b784c190d6 100644 --- a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/TaskUpdateParameters.cs +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/TaskUpdateParameters.cs @@ -34,6 +34,7 @@ public TaskUpdateParameters() /// /// Initializes a new instance of the TaskUpdateParameters class. /// + /// Identity for the resource. /// The current status of task. Possible values /// include: 'Disabled', 'Enabled' /// The platform properties against which the @@ -47,8 +48,9 @@ public TaskUpdateParameters() /// The parameters that describes a set of /// credentials that will be used when this run is invoked. /// The ARM resource tags. - public TaskUpdateParameters(string status = default(string), PlatformUpdateParameters platform = default(PlatformUpdateParameters), AgentProperties agentConfiguration = default(AgentProperties), int? timeout = default(int?), TaskStepUpdateParameters step = default(TaskStepUpdateParameters), TriggerUpdateParameters trigger = default(TriggerUpdateParameters), Credentials credentials = default(Credentials), IDictionary tags = default(IDictionary)) + public TaskUpdateParameters(IdentityProperties identity = default(IdentityProperties), string status = default(string), PlatformUpdateParameters platform = default(PlatformUpdateParameters), AgentProperties agentConfiguration = default(AgentProperties), int? timeout = default(int?), TaskStepUpdateParameters step = default(TaskStepUpdateParameters), TriggerUpdateParameters trigger = default(TriggerUpdateParameters), Credentials credentials = default(Credentials), IDictionary tags = default(IDictionary)) { + Identity = identity; Status = status; Platform = platform; AgentConfiguration = agentConfiguration; @@ -65,6 +67,12 @@ public TaskUpdateParameters() /// partial void CustomInit(); + /// + /// Gets or sets identity for the resource. + /// + [JsonProperty(PropertyName = "identity")] + public IdentityProperties Identity { get; set; } + /// /// Gets or sets the current status of task. Possible values include: /// 'Disabled', 'Enabled' diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/UserIdentityProperties.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/UserIdentityProperties.cs new file mode 100644 index 000000000000..4bfc20203430 --- /dev/null +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/Models/UserIdentityProperties.cs @@ -0,0 +1,58 @@ +// +// 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.ContainerRegistry.Models +{ + using Newtonsoft.Json; + using System.Linq; + + public partial class UserIdentityProperties + { + /// + /// Initializes a new instance of the UserIdentityProperties class. + /// + public UserIdentityProperties() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the UserIdentityProperties class. + /// + /// The principal id of user assigned + /// identity. + /// The client id of user assigned + /// identity. + public UserIdentityProperties(string principalId = default(string), string clientId = default(string)) + { + PrincipalId = principalId; + ClientId = clientId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the principal id of user assigned identity. + /// + [JsonProperty(PropertyName = "principalId")] + public string PrincipalId { get; set; } + + /// + /// Gets or sets the client id of user assigned identity. + /// + [JsonProperty(PropertyName = "clientId")] + public string ClientId { get; set; } + + } +} diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/RegistriesOperations.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/RegistriesOperations.cs index be5023e8823e..09afe4c96d51 100644 --- a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/RegistriesOperations.cs +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/RegistriesOperations.cs @@ -1942,7 +1942,7 @@ internal RegistriesOperations(ContainerRegistryManagementClient client) throw new ValidationException(ValidationRules.Pattern, "registryName", "^[a-zA-Z0-9]*$"); } } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -3311,7 +3311,7 @@ internal RegistriesOperations(ContainerRegistryManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "runRequest"); } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/RunsOperations.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/RunsOperations.cs index 991e1a7e1411..a2dbc626509a 100644 --- a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/RunsOperations.cs +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/RunsOperations.cs @@ -119,7 +119,7 @@ internal RunsOperations(ContainerRegistryManagementClient client) throw new ValidationException(ValidationRules.Pattern, "registryName", "^[a-zA-Z0-9]*$"); } } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -351,7 +351,7 @@ internal RunsOperations(ContainerRegistryManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "runId"); } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -604,7 +604,7 @@ internal RunsOperations(ContainerRegistryManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "runId"); } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -857,7 +857,7 @@ internal RunsOperations(ContainerRegistryManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "runId"); } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; RunUpdateParameters runUpdateParameters = new RunUpdateParameters(); if (isArchiveEnabled != null) { @@ -1109,7 +1109,7 @@ internal RunsOperations(ContainerRegistryManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "runId"); } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/SdkInfo_ContainerRegistryManagementClient.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/SdkInfo_ContainerRegistryManagementClient.cs index b84a693f13ca..76b609291149 100644 --- a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/SdkInfo_ContainerRegistryManagementClient.cs +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/SdkInfo_ContainerRegistryManagementClient.cs @@ -21,10 +21,10 @@ public static IEnumerable> ApiInfo_ContainerRegist { new Tuple("ContainerRegistry", "Operations", "2017-10-01"), new Tuple("ContainerRegistry", "Registries", "2017-10-01"), - new Tuple("ContainerRegistry", "Registries", "2018-09-01"), + new Tuple("ContainerRegistry", "Registries", "2019-04-01"), new Tuple("ContainerRegistry", "Replications", "2017-10-01"), - new Tuple("ContainerRegistry", "Runs", "2018-09-01"), - new Tuple("ContainerRegistry", "Tasks", "2018-09-01"), + new Tuple("ContainerRegistry", "Runs", "2019-04-01"), + new Tuple("ContainerRegistry", "Tasks", "2019-04-01"), new Tuple("ContainerRegistry", "Webhooks", "2017-10-01"), }.AsEnumerable(); } diff --git a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/TasksOperations.cs b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/TasksOperations.cs index 894b9b83311b..cd8205f6c864 100644 --- a/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/TasksOperations.cs +++ b/src/SDKs/ContainerRegistry/Management.ContainerRegistry/Generated/TasksOperations.cs @@ -115,7 +115,7 @@ internal TasksOperations(ContainerRegistryManagementClient client) throw new ValidationException(ValidationRules.Pattern, "registryName", "^[a-zA-Z0-9]*$"); } } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -353,7 +353,7 @@ internal TasksOperations(ContainerRegistryManagementClient client) throw new ValidationException(ValidationRules.Pattern, "taskName", "^[a-zA-Z0-9-_]*$"); } } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -674,7 +674,7 @@ internal TasksOperations(ContainerRegistryManagementClient client) throw new ValidationException(ValidationRules.Pattern, "taskName", "^[a-zA-Z0-9-_]*$"); } } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -925,7 +925,7 @@ internal TasksOperations(ContainerRegistryManagementClient client) { taskCreateParameters.Validate(); } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1187,7 +1187,7 @@ internal TasksOperations(ContainerRegistryManagementClient client) throw new ValidationException(ValidationRules.Pattern, "taskName", "^[a-zA-Z0-9-_]*$"); } } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1416,7 +1416,7 @@ internal TasksOperations(ContainerRegistryManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "taskUpdateParameters"); } - string apiVersion = "2018-09-01"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null;