Skip to content
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

[AutoPR @azure/arm-resources] Fix name collisions causing incorrect code generation #1078

Closed
wants to merge 1 commit into from
Closed

[AutoPR @azure/arm-resources] Fix name collisions causing incorrect code generation #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions sdk/resources/arm-resources/src/models/deploymentsMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/

export {
AliasPathType,
AliasPatternType1,
AliasType1,
Alias,
AliasPath,
AliasPattern,
BaseResource,
BasicDependency,
CloudError,
Expand Down
14 changes: 7 additions & 7 deletions sdk/resources/arm-resources/src/models/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ export interface ErrorResponse {
/**
* The type of the pattern for an alias path.
*/
export interface AliasPatternType1 {
export interface AliasPattern {
/**
* The alias pattern phrase.
*/
Expand All @@ -306,7 +306,7 @@ export interface AliasPatternType1 {
/**
* The type of the paths for alias.
*/
export interface AliasPathType {
export interface AliasPath {
/**
* The path of an alias.
*/
Expand All @@ -318,21 +318,21 @@ export interface AliasPathType {
/**
* The pattern for an alias path.
*/
pattern?: AliasPatternType1;
pattern?: AliasPattern;
}

/**
* The alias type.
*/
export interface AliasType1 {
export interface Alias {
/**
* The alias name.
*/
name?: string;
/**
* The paths for an alias.
*/
paths?: AliasPathType[];
paths?: AliasPath[];
/**
* The type of the alias. Possible values include: 'NotSpecified', 'PlainText', 'Mask'
*/
Expand All @@ -344,7 +344,7 @@ export interface AliasType1 {
/**
* The default pattern for an alias.
*/
defaultPattern?: AliasPatternType1;
defaultPattern?: AliasPattern;
}

/**
Expand All @@ -362,7 +362,7 @@ export interface ProviderResourceType {
/**
* The aliases that are supported by this resource type.
*/
aliases?: AliasType1[];
aliases?: Alias[];
/**
* The API version.
*/
Expand Down
26 changes: 13 additions & 13 deletions sdk/resources/arm-resources/src/models/mappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,11 +457,11 @@ export const ErrorResponse: msRest.CompositeMapper = {
}
};

export const AliasPatternType1: msRest.CompositeMapper = {
serializedName: "AliasPatternType",
export const AliasPattern: msRest.CompositeMapper = {
serializedName: "AliasPattern",
type: {
name: "Composite",
className: "AliasPatternType1",
className: "AliasPattern",
modelProperties: {
phrase: {
serializedName: "phrase",
Expand Down Expand Up @@ -489,11 +489,11 @@ export const AliasPatternType1: msRest.CompositeMapper = {
}
};

export const AliasPathType: msRest.CompositeMapper = {
serializedName: "AliasPathType",
export const AliasPath: msRest.CompositeMapper = {
serializedName: "AliasPath",
type: {
name: "Composite",
className: "AliasPathType",
className: "AliasPath",
modelProperties: {
path: {
serializedName: "path",
Expand All @@ -516,18 +516,18 @@ export const AliasPathType: msRest.CompositeMapper = {
serializedName: "pattern",
type: {
name: "Composite",
className: "AliasPatternType1"
className: "AliasPattern"
}
}
}
}
};

export const AliasType1: msRest.CompositeMapper = {
serializedName: "AliasType",
export const Alias: msRest.CompositeMapper = {
serializedName: "Alias",
type: {
name: "Composite",
className: "AliasType1",
className: "Alias",
modelProperties: {
name: {
serializedName: "name",
Expand All @@ -542,7 +542,7 @@ export const AliasType1: msRest.CompositeMapper = {
element: {
type: {
name: "Composite",
className: "AliasPathType"
className: "AliasPath"
}
}
}
Expand All @@ -568,7 +568,7 @@ export const AliasType1: msRest.CompositeMapper = {
serializedName: "defaultPattern",
type: {
name: "Composite",
className: "AliasPatternType1"
className: "AliasPattern"
}
}
}
Expand Down Expand Up @@ -605,7 +605,7 @@ export const ProviderResourceType: msRest.CompositeMapper = {
element: {
type: {
name: "Composite",
className: "AliasType1"
className: "Alias"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions sdk/resources/arm-resources/src/models/providersMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/

export {
AliasPathType,
AliasPatternType1,
AliasType1,
Alias,
AliasPath,
AliasPattern,
CloudError,
ErrorAdditionalInfo,
ErrorResponse,
Expand Down
6 changes: 3 additions & 3 deletions sdk/resources/arm-resources/src/models/resourceGroupsMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/

export {
AliasPathType,
AliasPatternType1,
AliasType1,
Alias,
AliasPath,
AliasPattern,
BaseResource,
BasicDependency,
CloudError,
Expand Down
6 changes: 3 additions & 3 deletions sdk/resources/arm-resources/src/models/resourcesMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/

export {
AliasPathType,
AliasPatternType1,
AliasType1,
Alias,
AliasPath,
AliasPattern,
BaseResource,
BasicDependency,
CloudError,
Expand Down
6 changes: 3 additions & 3 deletions sdk/resources/arm-resources/src/models/tagsOperationsMappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/

export {
AliasPathType,
AliasPatternType1,
AliasType1,
Alias,
AliasPath,
AliasPattern,
BaseResource,
BasicDependency,
CloudError,
Expand Down