diff --git a/profiles/latest/containerregistry/mgmt/containerregistry/models.go b/profiles/latest/containerregistry/mgmt/containerregistry/models.go index 4c6f504d6f5e..c621cdae5bb1 100644 --- a/profiles/latest/containerregistry/mgmt/containerregistry/models.go +++ b/profiles/latest/containerregistry/mgmt/containerregistry/models.go @@ -116,6 +116,7 @@ type EventRequestMessage = original.EventRequestMessage type EventResponseMessage = original.EventResponseMessage type ImportImageParameters = original.ImportImageParameters type ImportSource = original.ImportSource +type ImportSourceCredentials = original.ImportSourceCredentials type OperationDefinition = original.OperationDefinition type OperationDisplayDefinition = original.OperationDisplayDefinition type OperationListResult = original.OperationListResult @@ -132,6 +133,7 @@ type RegistriesImportImageFuture = original.RegistriesImportImageFuture type RegistriesUpdateFuture = original.RegistriesUpdateFuture type RegistriesUpdatePoliciesFuture = original.RegistriesUpdatePoliciesFuture type Registry = original.Registry +type RegistryIdentity = original.RegistryIdentity type RegistryListCredentialsResult = original.RegistryListCredentialsResult type RegistryListResult = original.RegistryListResult type RegistryListResultIterator = original.RegistryListResultIterator diff --git a/profiles/preview/containerregistry/mgmt/containerregistry/models.go b/profiles/preview/containerregistry/mgmt/containerregistry/models.go index 78b4f5d86eec..e4fbcc12eb37 100644 --- a/profiles/preview/containerregistry/mgmt/containerregistry/models.go +++ b/profiles/preview/containerregistry/mgmt/containerregistry/models.go @@ -256,6 +256,7 @@ type ImageDescriptor = original.ImageDescriptor type ImageUpdateTrigger = original.ImageUpdateTrigger type ImportImageParameters = original.ImportImageParameters type ImportSource = original.ImportSource +type ImportSourceCredentials = original.ImportSourceCredentials type OperationDefinition = original.OperationDefinition type OperationDisplayDefinition = original.OperationDisplayDefinition type OperationListResult = original.OperationListResult @@ -276,6 +277,7 @@ type RegistriesScheduleRunFuture = original.RegistriesScheduleRunFuture type RegistriesUpdateFuture = original.RegistriesUpdateFuture type RegistriesUpdatePoliciesFuture = original.RegistriesUpdatePoliciesFuture type Registry = original.Registry +type RegistryIdentity = original.RegistryIdentity type RegistryListCredentialsResult = original.RegistryListCredentialsResult type RegistryListResult = original.RegistryListResult type RegistryListResultIterator = original.RegistryListResultIterator diff --git a/profiles/preview/preview/containerregistry/mgmt/containerregistry/models.go b/profiles/preview/preview/containerregistry/mgmt/containerregistry/models.go index 4ea07de84b49..0aef752bb127 100644 --- a/profiles/preview/preview/containerregistry/mgmt/containerregistry/models.go +++ b/profiles/preview/preview/containerregistry/mgmt/containerregistry/models.go @@ -249,6 +249,7 @@ type ImageDescriptor = original.ImageDescriptor type ImageUpdateTrigger = original.ImageUpdateTrigger type ImportImageParameters = original.ImportImageParameters type ImportSource = original.ImportSource +type ImportSourceCredentials = original.ImportSourceCredentials type OperationDefinition = original.OperationDefinition type OperationDisplayDefinition = original.OperationDisplayDefinition type OperationListResult = original.OperationListResult @@ -271,6 +272,7 @@ type RegistriesQueueBuildFuture = original.RegistriesQueueBuildFuture type RegistriesUpdateFuture = original.RegistriesUpdateFuture type RegistriesUpdatePoliciesFuture = original.RegistriesUpdatePoliciesFuture type Registry = original.Registry +type RegistryIdentity = original.RegistryIdentity type RegistryListCredentialsResult = original.RegistryListCredentialsResult type RegistryListResult = original.RegistryListResult type RegistryListResultIterator = original.RegistryListResultIterator diff --git a/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go b/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go index 19c6fb28d78c..8e5ee3778cba 100644 --- a/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go +++ b/services/containerregistry/mgmt/2017-10-01/containerregistry/models.go @@ -443,8 +443,10 @@ type ImportImageParameters struct { type ImportSource struct { // ResourceID - The resource identifier of the source Azure Container Registry. ResourceID *string `json:"resourceId,omitempty"` - // RegistryURI - The address of the source registry. + // RegistryURI - The address of the source registry (e.g. 'mcr.microsoft.com'). RegistryURI *string `json:"registryUri,omitempty"` + // Credentials - Credentials used when importing from a registry uri. + Credentials *ImportSourceCredentials `json:"credentials,omitempty"` // SourceImage - Repository name of the source image. // Specify an image by repository ('hello-world'). This will use the 'latest' tag. // Specify an image by tag ('hello-world:latest'). @@ -452,6 +454,14 @@ type ImportSource struct { SourceImage *string `json:"sourceImage,omitempty"` } +// ImportSourceCredentials ... +type ImportSourceCredentials struct { + // Username - The username to authenticate with the source registry. + Username *string `json:"username,omitempty"` + // Password - The password used to authenticate with the source registry. + Password *string `json:"password,omitempty"` +} + // OperationDefinition the definition of a container registry operation. type OperationDefinition struct { // Origin - The origin information of the container registry operation. @@ -822,6 +832,8 @@ type Registry struct { autorest.Response `json:"-"` // Sku - The SKU of the container registry. Sku *Sku `json:"sku,omitempty"` + // Identity - The identity of the container registry. + Identity *RegistryIdentity `json:"identity,omitempty"` // RegistryProperties - The properties of the container registry. *RegistryProperties `json:"properties,omitempty"` // ID - The resource ID. @@ -842,6 +854,9 @@ func (r Registry) MarshalJSON() ([]byte, error) { if r.Sku != nil { objectMap["sku"] = r.Sku } + if r.Identity != nil { + objectMap["identity"] = r.Identity + } if r.RegistryProperties != nil { objectMap["properties"] = r.RegistryProperties } @@ -881,6 +896,15 @@ func (r *Registry) UnmarshalJSON(body []byte) error { } r.Sku = &sku } + case "identity": + if v != nil { + var identity RegistryIdentity + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + r.Identity = &identity + } case "properties": if v != nil { var registryProperties RegistryProperties @@ -941,6 +965,16 @@ func (r *Registry) UnmarshalJSON(body []byte) error { return nil } +// RegistryIdentity the identity of the container registry. +type RegistryIdentity struct { + // Type - The type of identity used for the registry. + Type *string `json:"type,omitempty"` + // PrincipalID - The principal ID of registry identity. + PrincipalID *string `json:"principalId,omitempty"` + // TenantID - The tenant ID associated with the registry. + TenantID *string `json:"tenantId,omitempty"` +} + // RegistryListCredentialsResult the response from the ListCredentials operation. type RegistryListCredentialsResult struct { autorest.Response `json:"-"` @@ -1118,6 +1152,8 @@ type RegistryUpdateParameters struct { Tags map[string]*string `json:"tags"` // Sku - The SKU of the container registry. Sku *Sku `json:"sku,omitempty"` + // Identity - The identity of the container registry. + Identity *RegistryIdentity `json:"identity,omitempty"` // RegistryPropertiesUpdateParameters - The properties that the container registry will be updated with. *RegistryPropertiesUpdateParameters `json:"properties,omitempty"` } @@ -1131,6 +1167,9 @@ func (rup RegistryUpdateParameters) MarshalJSON() ([]byte, error) { if rup.Sku != nil { objectMap["sku"] = rup.Sku } + if rup.Identity != nil { + objectMap["identity"] = rup.Identity + } if rup.RegistryPropertiesUpdateParameters != nil { objectMap["properties"] = rup.RegistryPropertiesUpdateParameters } @@ -1164,6 +1203,15 @@ func (rup *RegistryUpdateParameters) UnmarshalJSON(body []byte) error { } rup.Sku = &sku } + case "identity": + if v != nil { + var identity RegistryIdentity + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + rup.Identity = &identity + } case "properties": if v != nil { var registryPropertiesUpdateParameters RegistryPropertiesUpdateParameters diff --git a/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go b/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go index 4fce43c74d0a..b02ca13b2ea2 100644 --- a/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go +++ b/services/containerregistry/mgmt/2017-10-01/containerregistry/registries.go @@ -372,7 +372,10 @@ func (client RegistriesClient) ImportImage(ctx context.Context, resourceGroupNam {Target: "registryName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9]*$`, Chain: nil}}}, {TargetValue: parameters, Constraints: []validation.Constraint{{Target: "parameters.Source", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.Source.SourceImage", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + Chain: []validation.Constraint{{Target: "parameters.Source.Credentials", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.Source.Credentials.Password", Name: validation.Null, Rule: true, Chain: nil}}}, + {Target: "parameters.Source.SourceImage", Name: validation.Null, Rule: true, Chain: nil}, + }}}}}); err != nil { return result, validation.NewError("containerregistry.RegistriesClient", "ImportImage", err.Error()) } diff --git a/services/containerregistry/mgmt/2018-09-01/containerregistry/models.go b/services/containerregistry/mgmt/2018-09-01/containerregistry/models.go index 5ecbefe7e5eb..71282c0f81d7 100644 --- a/services/containerregistry/mgmt/2018-09-01/containerregistry/models.go +++ b/services/containerregistry/mgmt/2018-09-01/containerregistry/models.go @@ -1474,8 +1474,10 @@ type ImportImageParameters struct { type ImportSource struct { // ResourceID - The resource identifier of the source Azure Container Registry. ResourceID *string `json:"resourceId,omitempty"` - // RegistryURI - The address of the source registry. + // RegistryURI - The address of the source registry (e.g. 'mcr.microsoft.com'). RegistryURI *string `json:"registryUri,omitempty"` + // Credentials - Credentials used when importing from a registry uri. + Credentials *ImportSourceCredentials `json:"credentials,omitempty"` // SourceImage - Repository name of the source image. // Specify an image by repository ('hello-world'). This will use the 'latest' tag. // Specify an image by tag ('hello-world:latest'). @@ -1483,6 +1485,14 @@ type ImportSource struct { SourceImage *string `json:"sourceImage,omitempty"` } +// ImportSourceCredentials ... +type ImportSourceCredentials struct { + // Username - The username to authenticate with the source registry. + Username *string `json:"username,omitempty"` + // Password - The password used to authenticate with the source registry. + Password *string `json:"password,omitempty"` +} + // OperationDefinition the definition of a container registry operation. type OperationDefinition struct { // Origin - The origin information of the container registry operation. @@ -1913,6 +1923,8 @@ type Registry struct { autorest.Response `json:"-"` // Sku - The SKU of the container registry. Sku *Sku `json:"sku,omitempty"` + // Identity - The identity of the container registry. + Identity *RegistryIdentity `json:"identity,omitempty"` // RegistryProperties - The properties of the container registry. *RegistryProperties `json:"properties,omitempty"` // ID - The resource ID. @@ -1933,6 +1945,9 @@ func (r Registry) MarshalJSON() ([]byte, error) { if r.Sku != nil { objectMap["sku"] = r.Sku } + if r.Identity != nil { + objectMap["identity"] = r.Identity + } if r.RegistryProperties != nil { objectMap["properties"] = r.RegistryProperties } @@ -1972,6 +1987,15 @@ func (r *Registry) UnmarshalJSON(body []byte) error { } r.Sku = &sku } + case "identity": + if v != nil { + var identity RegistryIdentity + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + r.Identity = &identity + } case "properties": if v != nil { var registryProperties RegistryProperties @@ -2032,6 +2056,16 @@ func (r *Registry) UnmarshalJSON(body []byte) error { return nil } +// RegistryIdentity the identity of the container registry. +type RegistryIdentity struct { + // Type - The type of identity used for the registry. + Type *string `json:"type,omitempty"` + // PrincipalID - The principal ID of registry identity. + PrincipalID *string `json:"principalId,omitempty"` + // TenantID - The tenant ID associated with the registry. + TenantID *string `json:"tenantId,omitempty"` +} + // RegistryListCredentialsResult the response from the ListCredentials operation. type RegistryListCredentialsResult struct { autorest.Response `json:"-"` @@ -2209,6 +2243,8 @@ type RegistryUpdateParameters struct { Tags map[string]*string `json:"tags"` // Sku - The SKU of the container registry. Sku *Sku `json:"sku,omitempty"` + // Identity - The identity of the container registry. + Identity *RegistryIdentity `json:"identity,omitempty"` // RegistryPropertiesUpdateParameters - The properties that the container registry will be updated with. *RegistryPropertiesUpdateParameters `json:"properties,omitempty"` } @@ -2222,6 +2258,9 @@ func (rup RegistryUpdateParameters) MarshalJSON() ([]byte, error) { if rup.Sku != nil { objectMap["sku"] = rup.Sku } + if rup.Identity != nil { + objectMap["identity"] = rup.Identity + } if rup.RegistryPropertiesUpdateParameters != nil { objectMap["properties"] = rup.RegistryPropertiesUpdateParameters } @@ -2255,6 +2294,15 @@ func (rup *RegistryUpdateParameters) UnmarshalJSON(body []byte) error { } rup.Sku = &sku } + case "identity": + if v != nil { + var identity RegistryIdentity + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + rup.Identity = &identity + } case "properties": if v != nil { var registryPropertiesUpdateParameters RegistryPropertiesUpdateParameters diff --git a/services/containerregistry/mgmt/2018-09-01/containerregistry/registries.go b/services/containerregistry/mgmt/2018-09-01/containerregistry/registries.go index 8097b11a75bf..a933aabb1897 100644 --- a/services/containerregistry/mgmt/2018-09-01/containerregistry/registries.go +++ b/services/containerregistry/mgmt/2018-09-01/containerregistry/registries.go @@ -447,7 +447,10 @@ func (client RegistriesClient) ImportImage(ctx context.Context, resourceGroupNam {Target: "registryName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9]*$`, Chain: nil}}}, {TargetValue: parameters, Constraints: []validation.Constraint{{Target: "parameters.Source", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.Source.SourceImage", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + Chain: []validation.Constraint{{Target: "parameters.Source.Credentials", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.Source.Credentials.Password", Name: validation.Null, Rule: true, Chain: nil}}}, + {Target: "parameters.Source.SourceImage", Name: validation.Null, Rule: true, Chain: nil}, + }}}}}); err != nil { return result, validation.NewError("containerregistry.RegistriesClient", "ImportImage", err.Error()) } diff --git a/services/preview/containerregistry/mgmt/2018-02-01/containerregistry/models.go b/services/preview/containerregistry/mgmt/2018-02-01/containerregistry/models.go index db1ce2fa926c..c106ea0015c4 100644 --- a/services/preview/containerregistry/mgmt/2018-02-01/containerregistry/models.go +++ b/services/preview/containerregistry/mgmt/2018-02-01/containerregistry/models.go @@ -2109,8 +2109,10 @@ type ImportImageParameters struct { type ImportSource struct { // ResourceID - The resource identifier of the source Azure Container Registry. ResourceID *string `json:"resourceId,omitempty"` - // RegistryURI - The address of the source registry. + // RegistryURI - The address of the source registry (e.g. 'mcr.microsoft.com'). RegistryURI *string `json:"registryUri,omitempty"` + // Credentials - Credentials used when importing from a registry uri. + Credentials *ImportSourceCredentials `json:"credentials,omitempty"` // SourceImage - Repository name of the source image. // Specify an image by repository ('hello-world'). This will use the 'latest' tag. // Specify an image by tag ('hello-world:latest'). @@ -2118,6 +2120,14 @@ type ImportSource struct { SourceImage *string `json:"sourceImage,omitempty"` } +// ImportSourceCredentials ... +type ImportSourceCredentials struct { + // Username - The username to authenticate with the source registry. + Username *string `json:"username,omitempty"` + // Password - The password used to authenticate with the source registry. + Password *string `json:"password,omitempty"` +} + // OperationDefinition the definition of a container registry operation. type OperationDefinition struct { // Origin - The origin information of the container registry operation. @@ -2696,6 +2706,8 @@ type Registry struct { autorest.Response `json:"-"` // Sku - The SKU of the container registry. Sku *Sku `json:"sku,omitempty"` + // Identity - The identity of the container registry. + Identity *RegistryIdentity `json:"identity,omitempty"` // RegistryProperties - The properties of the container registry. *RegistryProperties `json:"properties,omitempty"` // ID - The resource ID. @@ -2716,6 +2728,9 @@ func (r Registry) MarshalJSON() ([]byte, error) { if r.Sku != nil { objectMap["sku"] = r.Sku } + if r.Identity != nil { + objectMap["identity"] = r.Identity + } if r.RegistryProperties != nil { objectMap["properties"] = r.RegistryProperties } @@ -2755,6 +2770,15 @@ func (r *Registry) UnmarshalJSON(body []byte) error { } r.Sku = &sku } + case "identity": + if v != nil { + var identity RegistryIdentity + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + r.Identity = &identity + } case "properties": if v != nil { var registryProperties RegistryProperties @@ -2815,6 +2839,16 @@ func (r *Registry) UnmarshalJSON(body []byte) error { return nil } +// RegistryIdentity the identity of the container registry. +type RegistryIdentity struct { + // Type - The type of identity used for the registry. + Type *string `json:"type,omitempty"` + // PrincipalID - The principal ID of registry identity. + PrincipalID *string `json:"principalId,omitempty"` + // TenantID - The tenant ID associated with the registry. + TenantID *string `json:"tenantId,omitempty"` +} + // RegistryListCredentialsResult the response from the ListCredentials operation. type RegistryListCredentialsResult struct { autorest.Response `json:"-"` @@ -2992,6 +3026,8 @@ type RegistryUpdateParameters struct { Tags map[string]*string `json:"tags"` // Sku - The SKU of the container registry. Sku *Sku `json:"sku,omitempty"` + // Identity - The identity of the container registry. + Identity *RegistryIdentity `json:"identity,omitempty"` // RegistryPropertiesUpdateParameters - The properties that the container registry will be updated with. *RegistryPropertiesUpdateParameters `json:"properties,omitempty"` } @@ -3005,6 +3041,9 @@ func (rup RegistryUpdateParameters) MarshalJSON() ([]byte, error) { if rup.Sku != nil { objectMap["sku"] = rup.Sku } + if rup.Identity != nil { + objectMap["identity"] = rup.Identity + } if rup.RegistryPropertiesUpdateParameters != nil { objectMap["properties"] = rup.RegistryPropertiesUpdateParameters } @@ -3038,6 +3077,15 @@ func (rup *RegistryUpdateParameters) UnmarshalJSON(body []byte) error { } rup.Sku = &sku } + case "identity": + if v != nil { + var identity RegistryIdentity + err = json.Unmarshal(*v, &identity) + if err != nil { + return err + } + rup.Identity = &identity + } case "properties": if v != nil { var registryPropertiesUpdateParameters RegistryPropertiesUpdateParameters diff --git a/services/preview/containerregistry/mgmt/2018-02-01/containerregistry/registries.go b/services/preview/containerregistry/mgmt/2018-02-01/containerregistry/registries.go index 60dea4f8b109..1f42871ecc85 100644 --- a/services/preview/containerregistry/mgmt/2018-02-01/containerregistry/registries.go +++ b/services/preview/containerregistry/mgmt/2018-02-01/containerregistry/registries.go @@ -447,7 +447,10 @@ func (client RegistriesClient) ImportImage(ctx context.Context, resourceGroupNam {Target: "registryName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9]*$`, Chain: nil}}}, {TargetValue: parameters, Constraints: []validation.Constraint{{Target: "parameters.Source", Name: validation.Null, Rule: true, - Chain: []validation.Constraint{{Target: "parameters.Source.SourceImage", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil { + Chain: []validation.Constraint{{Target: "parameters.Source.Credentials", Name: validation.Null, Rule: false, + Chain: []validation.Constraint{{Target: "parameters.Source.Credentials.Password", Name: validation.Null, Rule: true, Chain: nil}}}, + {Target: "parameters.Source.SourceImage", Name: validation.Null, Rule: true, Chain: nil}, + }}}}}); err != nil { return result, validation.NewError("containerregistry.RegistriesClient", "ImportImage", err.Error()) }