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

Jump to bottom

MSI: Use common types. Fix definitions for proper .NET SDK generation. #8352

Merged
merged 4 commits into from
Feb 27, 2020
Merged

MSI: Use common types. Fix definitions for proper .NET SDK generation. #8352

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
76f4cee
Use common types. Fix definitions for proper .NET SDK generation.
angosms Feb 10, 2020
f7e347d
Use tracked and proxy resource types
angosms Feb 20, 2020
2d1e54a
Revert reference of IdentityPatch to Identity resource
angosms Feb 24, 2020
7982d4e
Revert the previous revert
angosms Feb 24, 2020
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
73 changes: 22 additions & 51 deletions ...esource-manager/Microsoft.ManagedIdentity/preview/2015-08-31-preview/ManagedIdentity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,88 +351,59 @@
}
},
"definitions": {
"Resource": {
"properties": {
"id": {
"type": "string",
"readOnly": true,
"description": "The id of the resource."
},
"name": {
"type": "string",
"readOnly": true,
"description": "The name of the resource."
},
"location": {
"type": "string",
"description": "The Azure region where the resource lives."
}
},
"x-ms-azure-resource": true,
"description": "Describes common properties of a resource."
},
"Identity": {
"properties": {
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Resource tags"
},
"properties": {
"x-ms-client-flatten": true,
"readOnly": true,
"description": "The properties associated with the identity.",
"$ref": "#/definitions/IdentityProperties"
},
"type": {
"type": "string",
"readOnly": true,
"enum": [
"Microsoft.ManagedIdentity/userAssignedIdentities"
],
"x-ms-enum": {
"name": "UserAssignedIdentities",
"modelAsString": true
},
"description": "The type of resource i.e. Microsoft.ManagedIdentity/userAssignedIdentities"
}
},
"required": [
"location"
],
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
}
],
"x-ms-azure-resource": true,
"description": "Describes an identity resource."
},
"SystemAssignedIdentity": {
"properties": {
"location": {
"type": "string",
"x-ms-mutability": [
"read",
"create"
],
"description": "The geo-location where the resource lives"
},
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"x-ms-mutability": [
"read",
"create",
"update"
],
"description": "Resource tags"
},
"properties": {
"x-ms-client-flatten": true,
"readOnly": true,
"description": "The properties associated with the identity.",
"$ref": "#/definitions/IdentityProperties"
},
"type": {
"type": "string",
"readOnly": true,
"description": "The type of resource i.e. Microsoft.Compute/virtualMachineScaleSets"
}
},
"required": [
"location"
],
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"x-ms-azure-resource": true,
"description": "Describes a system assigned identity resource."
},
"IdentityProperties": {
Expand Down
105 changes: 38 additions & 67 deletions ...ion/msi/resource-manager/Microsoft.ManagedIdentity/stable/2018-11-30/ManagedIdentity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/IdentityPatch"
"$ref": "#/definitions/IdentityUpdate"
allenjzhang marked this conversation as resolved.
Show resolved Hide resolved
},
"description": "Parameters to update the identity"
}
Expand Down Expand Up @@ -351,124 +351,95 @@
}
},
"definitions": {
"Resource": {
"properties": {
"id": {
"type": "string",
"readOnly": true,
"description": "The id of the resource."
},
"name": {
"type": "string",
"readOnly": true,
"description": "The name of the resource."
},
"location": {
"type": "string",
"description": "The Azure region where the resource lives."
}
},
"x-ms-azure-resource": true,
"description": "Describes common properties of a resource."
},
"Identity": {
"properties": {
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Resource tags"
},
"properties": {
"x-ms-client-flatten": true,
"readOnly": true,
"description": "The properties associated with the identity.",
"$ref": "#/definitions/UserAssignedIdentityProperties"
},
"type": {
"type": "string",
"readOnly": true,
"enum": [
"Microsoft.ManagedIdentity/userAssignedIdentities"
],
"x-ms-enum": {
"name": "UserAssignedIdentities",
"modelAsString": true
},
"description": "The type of resource i.e. Microsoft.ManagedIdentity/userAssignedIdentities"
}
},
"required": [
"location"
],
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
}
],
"x-ms-azure-resource": true,
"description": "Describes an identity resource."
},
"IdentityPatch": {
"IdentityUpdate": {
"properties": {
"location": {
"type": "string",
"x-ms-mutability": [
"read",
"create"
],
"description": "The geo-location where the resource lives"
},
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"x-ms-mutability": [
"read",
"create",
"update"
],
"description": "Resource tags"
},
"properties": {
"x-ms-client-flatten": true,
"readOnly": true,
"description": "The properties associated with the identity.",
"$ref": "#/definitions/UserAssignedIdentityProperties"
},
"type": {
"type": "string",
"readOnly": true,
"enum": [
"Microsoft.ManagedIdentity/userAssignedIdentities"
],
"x-ms-enum": {
"name": "UserAssignedIdentities",
"modelAsString": true
},
"description": "The type of resource i.e. Microsoft.ManagedIdentity/userAssignedIdentities"
}
},
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Resource"
}
],
"x-ms-azure-resource": true,
"description": "Describes an identity resource."
},
"SystemAssignedIdentity": {
"properties": {
"location": {
"type": "string",
"x-ms-mutability": [
"read",
"create"
],
"description": "The geo-location where the resource lives"
},
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"x-ms-mutability": [
"read",
"create",
"update"
],
"description": "Resource tags"
},
"properties": {
"x-ms-client-flatten": true,
"readOnly": true,
"description": "The properties associated with the identity.",
"$ref": "#/definitions/SystemAssignedIdentityProperties"
},
"type": {
"type": "string",
"readOnly": true,
"description": "The type of resource i.e. Microsoft.Compute/virtualMachineScaleSets"
}
},
"required": [
"location"
],
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"x-ms-azure-resource": true,
"description": "Describes a system assigned identity resource."
},
"SystemAssignedIdentityProperties": {
Expand Down