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.

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

Fixed S360 issues related to ARM & SDK swagger linting errors for Microsoft.Solutions. #10804

Merged
merged 9 commits into from
Sep 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"applicationDefinitionName": "myManagedApplicationDef",
"api-version": "2020-08-21-preview"
},
"responses": {
"200": {},
"202": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
"name": "parameters",
"in": "body",
"schema": {
"$ref": "#/definitions/Application"
"$ref": "#/definitions/ApplicationPatchable"
},
"description": "Parameters supplied to update an existing managed application."
},
Expand Down Expand Up @@ -1106,24 +1106,43 @@
}
},
"x-ms-paths": {
"/{applicationDefinitionId}?disambiguation_dummy": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Solutions/applicationDefinitions/{applicationDefinitionName}?disambiguation_dummy": {
"get": {
"tags": [
"ApplicationDefinitions"
],
"operationId": "ApplicationDefinitions_GetById",
"description": "Gets the managed application definition.",
"x-ms-examples": {
"Get managed application definition": {
"$ref": "./examples/getApplicationDefinition.json"
}
},
"parameters": [
{
"name": "applicationDefinitionId",
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name}",
"x-ms-skip-url-encoding": true
"description": "The name of the resource group. The name is case insensitive.",
"pattern": "^[-\\w\\._\\(\\)]+$",
"minLength": 1,
"maxLength": 90
},
{
"name": "applicationDefinitionName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the managed application definition.",
"minLength": 3,
"maxLength": 64
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand All @@ -1147,17 +1166,36 @@
],
"operationId": "ApplicationDefinitions_DeleteById",
"description": "Deletes the managed application definition.",
"x-ms-examples": {
"Get managed application definition": {
"$ref": "./examples/deleteApplicationDefinition.json"
}
},
"parameters": [
{
"name": "applicationDefinitionId",
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name}",
"x-ms-skip-url-encoding": true
"description": "The name of the resource group. The name is case insensitive.",
"pattern": "^[-\\w\\._\\(\\)]+$",
"minLength": 1,
"maxLength": 90
},
{
"name": "applicationDefinitionName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the managed application definition.",
"minLength": 3,
"maxLength": 64
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -1185,14 +1223,36 @@
],
"operationId": "ApplicationDefinitions_CreateOrUpdateById",
"description": "Creates a new managed application definition.",
"x-ms-examples": {
"Create or update managed application definition": {
"$ref": "./examples/createOrUpdateApplicationDefinition.json"
}
},
"parameters": [
{
"name": "applicationDefinitionId",
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name}",
"x-ms-skip-url-encoding": true
"description": "The name of the resource group. The name is case insensitive.",
"pattern": "^[-\\w\\._\\(\\)]+$",
"minLength": 1,
"maxLength": 90
},
{
"name": "applicationDefinitionName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the managed application definition.",
"minLength": 3,
"maxLength": 64
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"name": "parameters",
Expand All @@ -1202,9 +1262,6 @@
"$ref": "#/definitions/ApplicationDefinition"
},
"description": "Parameters supplied to the create or update a managed application definition."
},
{
"$ref": "#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -1268,7 +1325,7 @@
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/ApplicationPropertiesPatchable",
"$ref": "#/definitions/ApplicationProperties",
"description": "The managed application properties."
},
"plan": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"managedApplicationName": "myManagedApplication",
"applicationName": "myManagedApplication",
"api-version": "2018-06-01",
"parameters": {
"properties": {
"managedApplicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myAppDef",
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG"
},
"name": "myManagedApplication",
"location": "East US 2",
"kind": "ServiceCatalog"
}
Expand All @@ -23,14 +21,33 @@
"type": "Microsoft.Solutions/applications",
"location": "East US 2",
"managedBy": null,
"resourceGroup": "rg",
"tags": null,
"plan": null,
"identity": null,
"kind": "ServiceCatalog",
"sku": null,
"properties": {
"managedApplicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myAppDef",
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
"outputs": null,
"parameters": null,
"provisioningState": "Created"
}
}
},
"200": {
"headers": {},
"body": {
"name": "myManagedApplication",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applications/myManagedApplication",
"type": "Microsoft.Solutions/applications",
"location": "East US 2",
"managedBy": null,
"tags": null,
"plan": null,
"identity": null,
"kind": "ServiceCatalog",
"sku": null,
"properties": {
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
"outputs": null,
"parameters": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"managedApplicationDefinitionName": "myManagedApplicationDef",
"applicationDefinitionName": "myManagedApplicationDef",
"api-version": "2018-06-01",
"parameters": {
"properties": {
Expand All @@ -29,7 +29,6 @@
"type": "Microsoft.Solutions/applicationDefinitions",
"location": "East US 2",
"managedBy": null,
"resourceGroup": "rg",
"tags": null,
"identity": null,
"sku": null,
Expand All @@ -54,7 +53,44 @@
],
"description": "myManagedApplicationDef description",
"displayName": "myManagedApplicationDef",
"lockLevel": null,
"lockLevel": "None",
"packageFileUri": "https://path/to/packagezipfile"
}
}
},
"200": {
"headers": {},
"body": {
"name": "myManagedApplicationDef",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myManagedApplicationDef",
"type": "Microsoft.Solutions/applicationDefinitions",
"location": "East US 2",
"managedBy": null,
"tags": null,
"identity": null,
"sku": null,
"properties": {
"artifacts": [
{
"name": "CreateUiDefinition",
"type": "Custom",
"uri": "https://path/to/managedApplicationCreateUiDefinition.json"
},
{
"name": "ManagedApplicationResourceTemplate",
"type": "Template",
"uri": "https://path/to/mainTemplate.json"
}
],
"authorizations": [
{
"principalId": "validprincipalguid",
"roleDefinitionId": "validroleguid"
}
],
"description": "myManagedApplicationDef description",
"displayName": "myManagedApplicationDef",
"lockLevel": "None",
"packageFileUri": "https://path/to/packagezipfile"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"applicationDefinitionName": "myManagedApplicationDef",
"api-version": "2018-06-01"
},
"responses": {
"204": {},
"200": {},
"202": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"managedApplicationName": "myManagedApplication",
"applicationName": "myManagedApplication",
"api-version": "2018-06-01"
},
"responses": {
Expand All @@ -14,20 +14,19 @@
"type": "Microsoft.Solutions/applications",
"location": "East US 2",
"managedBy": null,
"resourceGroup": "rg",
"tags": null,
"plan": null,
"identity": null,
"kind": "ServiceCatalog",
"sku": null,
"properties": {
"managedApplicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/managedApplicationDefinitions/myAppDef",
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
"outputs": null,
"parameters": null,
"provisioningState": "Created"
}
}
}
},
"404": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"managedApplicationName": "myManagedApplicationDef",
"applicationDefinitionName": "myManagedApplicationDef",
"api-version": "2018-06-01"
},
"responses": {
Expand All @@ -14,7 +14,6 @@
"type": "Microsoft.Solutions/applicationDefinitions",
"location": "East US 2",
"managedBy": null,
"resourceGroup": "rg",
"tags": null,
"identity": null,
"sku": null,
Expand All @@ -39,10 +38,11 @@
],
"description": "myManagedApplicationDef description",
"displayName": "myManagedApplicationDef",
"lockLevel": null,
"lockLevel": "None",
"packageFileUri": "https://path/to/packagezipfile"
}
}
}
},
"404": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"type": "Microsoft.Solutions/applicationDefinitions",
"location": "East US 2",
"managedBy": null,
"resourceGroup": "rg",
"tags": null,
"identity": null,
"sku": null,
Expand All @@ -40,7 +39,7 @@
],
"description": "myManagedApplicationDef description",
"displayName": "myManagedApplicationDef",
"lockLevel": null,
"lockLevel": "None",
"packageFileUri": "https://path/to/packagezipfile"
}
},
Expand All @@ -50,7 +49,6 @@
"type": "Microsoft.Solutions/applicationDefinitions",
"location": "West US",
"managedBy": null,
"resourceGroup": "rg",
"tags": null,
"identity": null,
"sku": null,
Expand All @@ -75,7 +73,7 @@
],
"description": "myManagedApplicationDef2 description",
"displayName": "myManagedApplicationDef2",
"lockLevel": null,
"lockLevel": "None",
"packageFileUri": "https://path/to/packagezipfile"
}
}
Expand Down
Loading