Skip to content

Fix managed service identity duplicated schema issue #31100

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

Merged
jijohn14 merged 4 commits into from
Oct 23, 2024
Merged

Fix managed service identity duplicated schema issue #31100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
839b27f
update
Juliehzl Oct 18, 2024
ce65107
fix check
Juliehzl Oct 18, 2024
3da269f
Merge branch 'release-app-Microsoft.App-2024-10-02-preview' into user…
Juliehzl Oct 21, 2024
a38b19f
Merge branch 'release-app-Microsoft.App-2024-10-02-preview' into user…
Juliehzl Oct 23, 2024
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
5 changes: 2 additions & 3 deletions specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/Builders.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@
]
},
"identity": {
"$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity",
"$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity",
"description": "The managed service identities assigned to this resource."
}
},
Expand Down Expand Up @@ -410,7 +410,7 @@
"type": "object",
"properties": {
"identity": {
"$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity",
"$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity",
"description": "The managed service identities assigned to this resource."
},
"tags": {
Expand Down Expand Up @@ -489,4 +489,3 @@
}
}
}

2 changes: 1 addition & 1 deletion ...fication/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
},
"identity": {
"description": "managed identities for the Container App to interact with other Azure services without maintaining any secrets or credentials in code.",
"$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity"
"$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity"
},
"managedBy": {
"type": "string",
Expand Down
5 changes: 2 additions & 3 deletions specification/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/Jobs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@
},
"identity": {
"description": "Managed identities needed by a container app job to interact with other Azure services to not maintain any secrets or credentials in code.",
"$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity"
"$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity"
},
"properties": {
"description": "Container Apps Job resource specific properties.",
Expand Down Expand Up @@ -979,7 +979,7 @@
},
"identity": {
"description": "Managed identities needed by a container app job to interact with other Azure services to not maintain any secrets or credentials in code.",
"$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity"
"$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity"
},
"tags": {
"type": "object",
Expand Down Expand Up @@ -1421,4 +1421,3 @@
}
]
}

2 changes: 1 addition & 1 deletion ...on/app/resource-manager/Microsoft.App/preview/2024-10-02-preview/ManagedEnvironments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1584,7 +1584,7 @@
},
"identity": {
"description": "Managed identities for the Managed Environment to interact with other Azure services without maintaining any secrets or credentials in code.",
"$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity"
"$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity"
},
"properties": {
"description": "Managed environment resource specific properties",
Expand Down