From 00b20574e58af82dfa23e5bdd4ea329a20c53f07 Mon Sep 17 00:00:00 2001 From: Annina Keller Date: Mon, 27 Mar 2023 17:06:02 -0700 Subject: [PATCH 1/2] introduce static web apps free trial APIs --- .../stable/2022-09-01/StaticSites.json | 257 ++++++++++++++++++ .../examples/CreateFreeTrialStaticWebApp.json | 43 +++ .../examples/DeleteFreeTrialStaticWebApp.json | 10 + .../examples/GetFreeTrialStaticWebApp.json | 28 ++ .../examples/ListFreeTrialStaticWebApps.json | 48 ++++ .../UpgradeFreeTrialStaticWebApp.json | 20 ++ 6 files changed, 406 insertions(+) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/CreateFreeTrialStaticWebApp.json create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/DeleteFreeTrialStaticWebApp.json create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/GetFreeTrialStaticWebApp.json create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/ListFreeTrialStaticWebApps.json create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/UpgradeFreeTrialStaticWebApp.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/StaticSites.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/StaticSites.json index fbdbe9d100eb..231e89136c01 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/StaticSites.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/StaticSites.json @@ -4202,6 +4202,215 @@ } } } + }, + "/providers/Microsoft.Web/freeTrialStaticWebApps": { + "get": { + "tags": [ + "StaticSites" + ], + "summary": "Lists all free trial static web apps.", + "operationId": "StaticSites_ListFreeTrialStaticWebApps", + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FreeTrialStaticWebAppsProxyEntityCollection" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "Get free trial static web app": { + "$ref": "./examples/ListFreeTrialStaticWebApps.json" + } + } + } + }, + "/providers/Microsoft.Web/freeTrialStaticWebApps/{freeTrialStaticWebAppName}": { + "get": { + "tags": [ + "StaticSites" + ], + "summary": "Gets a free trial static web app.", + "operationId": "StaticSites_GetFreeTrialStaticWebApp", + "parameters": [ + { + "name": "freeTrialStaticWebAppName", + "in": "path", + "description": "Name of the free trial static web app.", + "required": true, + "pattern": "^[a-zA-Z0-9]+$", + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FreeTrialStaticWebAppsProxyEntity" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "Gets a free trial static web app": { + "$ref": "./examples/GetFreeTrialStaticWebApp.json" + } + } + }, + "put": { + "tags": [ + "StaticSites" + ], + "summary": "Creates a free trial static web app.", + "operationId": "StaticSites_CreateFreeTrialStaticWebApp", + "parameters": [ + { + "name": "freeTrialStaticWebAppName", + "in": "path", + "description": "Name of the free trial static web app.", + "required": true, + "pattern": "^[a-zA-Z0-9]+$", + "type": "string" + }, + { + "name": "freeTrialStaticWebApp", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/FreeTrialStaticWebAppsProxyEntity" + } + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FreeTrialStaticWebAppsProxyEntity" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "Creates a free trial static web apps": { + "$ref": "./examples/CreateFreeTrialStaticWebApp.json" + } + } + }, + "delete": { + "tags": [ + "StaticSites" + ], + "summary": "Deletes a free trial static web app.", + "operationId": "StaticSites_DeleteFreeTrialStaticWebApp", + "parameters": [ + { + "name": "freeTrialStaticWebAppName", + "in": "path", + "description": "Name of the free trial static web app.", + "required": true, + "pattern": "^[a-zA-Z0-9]+$", + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "204": { + "description": "No content" + }, + "200": { + "description": "OK." + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "Deletes a free trial static web apps": { + "$ref": "./examples/DeleteFreeTrialStaticWebApp.json" + } + } + } + }, + "/providers/Microsoft.Web/freeTrialStaticWebApps/{freeTrialStaticWebAppName}/upgrade": { + "post": { + "tags": [ + "StaticSites" + ], + "summary": "Upgrades a free trial static web app.", + "operationId": "StaticSites_UpgradeFreeTrialStaticWebApp", + "parameters": [ + { + "name": "freeTrialStaticWebAppName", + "in": "path", + "description": "Name of the free trial static web app.", + "required": true, + "pattern": "^[a-zA-Z0-9]+$", + "type": "string" + }, + { + "name": "freeTrialStaticWebApp", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/FreeTrialStaticWebAppsProxyEntity" + } + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "204": { + "description": "No content" + }, + "200": { + "description": "OK." + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "Upgrades a free trial static web apps": { + "$ref": "./examples/UpgradeFreeTrialStaticWebApp.json" + } + } + } } }, "definitions": { @@ -5515,6 +5724,54 @@ "readOnly": true } } + }, + "FreeTrialStaticWebAppsProxyEntity": { + "type": "object", + "allOf": [ + { + "$ref": "./CommonDefinitions.json#/definitions/Resource" + } + ], + "properties": { + "sku": { + "$ref": "./CommonDefinitions.json#/definitions/SkuDescription", + "description": "SKU description of the resource." + }, + "properties": { + "description": "FreeTrialStaticWebAppsProxyEntity resource specific properties", + "type": "object", + "properties": { + "properties": { + "$ref": "#/definitions/StaticSite" + }, + "staticSiteResourceId": { + "type": "string", + "readOnly": true + } + } + } + } + }, + "FreeTrialStaticWebAppsProxyEntityCollection": { + "description": "Collection of free trial static web apps.", + "required": [ + "value" + ], + "type": "object", + "properties": { + "value": { + "description": "Collection of resources.", + "type": "array", + "items": { + "$ref": "#/definitions/FreeTrialStaticWebAppsProxyEntity" + } + }, + "nextLink": { + "description": "Link to next page of resources.", + "type": "string", + "readOnly": true + } + } } }, "parameters": { diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/CreateFreeTrialStaticWebApp.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/CreateFreeTrialStaticWebApp.json new file mode 100644 index 000000000000..0e412e71e1c5 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/CreateFreeTrialStaticWebApp.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "freeTrialStaticWebAppName": "testSite", + "api-version": "2022-09-01", + "freeTrialStaticWebApp": { + "location": "West US 2", + "properties": { + "staticSite": { + "repositoryUrl": "https://github.com/username/RepoName", + "branch": "master", + "repositoryToken": "repoToken123", + "buildProperties": { + "appLocation": "app", + "apiLocation": "api", + "appArtifactLocation": "build" + } + } + } + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "Microsoft.Web/freeTrialStaticWebApps/testSite", + "name": "testSite", + "type": "Microsoft.Web/freeTrialStaticWebApps", + "location": "West US 2", + "properties": { + "staticSite": { + "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", + "repositoryUrl": "https://github.com/username/RepoName", + "branch": "master", + "contentDistributionEndpoint": "", + "stagingEnvironmentPolicy": "Enabled", + "allowConfigFileUpdates": true + }, + "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite" + } + } + } + } +} \ No newline at end of file diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/DeleteFreeTrialStaticWebApp.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/DeleteFreeTrialStaticWebApp.json new file mode 100644 index 000000000000..648cf9dae780 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/DeleteFreeTrialStaticWebApp.json @@ -0,0 +1,10 @@ +{ + "parameters": { + "freeTrialStaticWebAppName": "testSite", + "api-version": "2022-09-01" + }, + "responses": { + "200": {}, + "204": {} + } +} \ No newline at end of file diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/GetFreeTrialStaticWebApp.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/GetFreeTrialStaticWebApp.json new file mode 100644 index 000000000000..980e37d0b041 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/GetFreeTrialStaticWebApp.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "freeTrialStaticWebAppName": "testSite", + "api-version": "2022-09-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "Microsoft.Web/freeTrialStaticWebApps/testSite", + "name": "testSite", + "type": "Microsoft.Web/freeTrialStaticWebApps", + "location": "West US 2", + "properties": { + "staticSite": { + "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", + "repositoryUrl": "https://github.com/username/RepoName", + "branch": "master", + "contentDistributionEndpoint": "", + "stagingEnvironmentPolicy": "Enabled", + "allowConfigFileUpdates": true + }, + "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite" + } + } + } + } +} \ No newline at end of file diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/ListFreeTrialStaticWebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/ListFreeTrialStaticWebApps.json new file mode 100644 index 000000000000..87807c44b0d6 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/ListFreeTrialStaticWebApps.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "api-version": "2022-09-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "Microsoft.Web/freeTrialStaticWebApps/testSite", + "name": "testSite", + "type": "Microsoft.Web/freeTrialStaticWebApps", + "location": "West US 2", + "properties": { + "staticSite": { + "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", + "repositoryUrl": "https://github.com/username/RepoName", + "branch": "master", + "contentDistributionEndpoint": "", + "stagingEnvironmentPolicy": "Enabled", + "allowConfigFileUpdates": true + }, + "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite" + } + }, + { + "id": "Microsoft.Web/freeTrialStaticWebApps/testSite2", + "name": "testSite2", + "type": "Microsoft.Web/freeTrialStaticWebApps", + "location": "West US 2", + "properties": { + "staticSite": { + "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", + "repositoryUrl": "https://github.com/username/RepoName", + "branch": "master", + "contentDistributionEndpoint": "", + "stagingEnvironmentPolicy": "Enabled", + "allowConfigFileUpdates": true + }, + "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite2" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/UpgradeFreeTrialStaticWebApp.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/UpgradeFreeTrialStaticWebApp.json new file mode 100644 index 000000000000..1e837e61c5bd --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/UpgradeFreeTrialStaticWebApp.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "freeTrialStaticWebAppName": "testSite", + "api-version": "2022-09-01", + "freeTrialStaticWebApp": { + "location": "westus2", + "sku": { + "name": "Standard", + "tier": "Standard" + }, + "properties": { + "targetResourceGroupResourceId": "/subscriptions/7bfb0c4d-7719-45a5-a74a-f1ae38c81b01/resourceGroups/myResourceGroup" + } + } + }, + "responses": { + "200": {}, + "204": {} + } +} \ No newline at end of file From 36fce7c8a2501b7bb9eb9da926679df13902b0fd Mon Sep 17 00:00:00 2001 From: Annina Keller Date: Fri, 19 May 2023 11:25:39 -0700 Subject: [PATCH 2/2] fix --- .../stable/2022-09-01/StaticSites.json | 4 +++ .../examples/CreateFreeTrialStaticWebApp.json | 34 ++++++++---------- .../examples/GetFreeTrialStaticWebApp.json | 18 +++++----- .../examples/ListFreeTrialStaticWebApps.json | 36 +++++++++---------- 4 files changed, 43 insertions(+), 49 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/StaticSites.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/StaticSites.json index 231e89136c01..5c7e1d96fe9a 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/StaticSites.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/StaticSites.json @@ -4656,6 +4656,10 @@ "name" ], "readOnly": true + }, + "targetResourceGroupResourceId": { + "description": "The target resource group id when upgrading a site from trial.", + "type": "string" } } }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/CreateFreeTrialStaticWebApp.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/CreateFreeTrialStaticWebApp.json index 0e412e71e1c5..64d85c808112 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/CreateFreeTrialStaticWebApp.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/CreateFreeTrialStaticWebApp.json @@ -5,15 +5,13 @@ "freeTrialStaticWebApp": { "location": "West US 2", "properties": { - "staticSite": { - "repositoryUrl": "https://github.com/username/RepoName", - "branch": "master", - "repositoryToken": "repoToken123", - "buildProperties": { - "appLocation": "app", - "apiLocation": "api", - "appArtifactLocation": "build" - } + "repositoryUrl": "https://github.com/username/RepoName", + "branch": "master", + "repositoryToken": "repoToken123", + "buildProperties": { + "appLocation": "app", + "apiLocation": "api", + "appArtifactLocation": "build" } } } @@ -27,16 +25,14 @@ "type": "Microsoft.Web/freeTrialStaticWebApps", "location": "West US 2", "properties": { - "staticSite": { - "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", - "repositoryUrl": "https://github.com/username/RepoName", - "branch": "master", - "contentDistributionEndpoint": "", - "stagingEnvironmentPolicy": "Enabled", - "allowConfigFileUpdates": true - }, - "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite" - } + "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", + "repositoryUrl": "https://github.com/username/RepoName", + "branch": "master", + "contentDistributionEndpoint": "", + "stagingEnvironmentPolicy": "Enabled", + "allowConfigFileUpdates": true + }, + "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite" } } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/GetFreeTrialStaticWebApp.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/GetFreeTrialStaticWebApp.json index 980e37d0b041..213e823cacdb 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/GetFreeTrialStaticWebApp.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/GetFreeTrialStaticWebApp.json @@ -12,16 +12,14 @@ "type": "Microsoft.Web/freeTrialStaticWebApps", "location": "West US 2", "properties": { - "staticSite": { - "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", - "repositoryUrl": "https://github.com/username/RepoName", - "branch": "master", - "contentDistributionEndpoint": "", - "stagingEnvironmentPolicy": "Enabled", - "allowConfigFileUpdates": true - }, - "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite" - } + "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", + "repositoryUrl": "https://github.com/username/RepoName", + "branch": "master", + "contentDistributionEndpoint": "", + "stagingEnvironmentPolicy": "Enabled", + "allowConfigFileUpdates": true + }, + "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite" } } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/ListFreeTrialStaticWebApps.json b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/ListFreeTrialStaticWebApps.json index 87807c44b0d6..152e1e850fb8 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/ListFreeTrialStaticWebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2022-09-01/examples/ListFreeTrialStaticWebApps.json @@ -13,16 +13,14 @@ "type": "Microsoft.Web/freeTrialStaticWebApps", "location": "West US 2", "properties": { - "staticSite": { - "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", - "repositoryUrl": "https://github.com/username/RepoName", - "branch": "master", - "contentDistributionEndpoint": "", - "stagingEnvironmentPolicy": "Enabled", - "allowConfigFileUpdates": true - }, - "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite" - } + "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", + "repositoryUrl": "https://github.com/username/RepoName", + "branch": "master", + "contentDistributionEndpoint": "", + "stagingEnvironmentPolicy": "Enabled", + "allowConfigFileUpdates": true + }, + "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite" }, { "id": "Microsoft.Web/freeTrialStaticWebApps/testSite2", @@ -30,16 +28,14 @@ "type": "Microsoft.Web/freeTrialStaticWebApps", "location": "West US 2", "properties": { - "staticSite": { - "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", - "repositoryUrl": "https://github.com/username/RepoName", - "branch": "master", - "contentDistributionEndpoint": "", - "stagingEnvironmentPolicy": "Enabled", - "allowConfigFileUpdates": true - }, - "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite2" - } + "defaultHostname": "mango-pebble-15afae3e.azurestaticwebsites.net", + "repositoryUrl": "https://github.com/username/RepoName", + "branch": "master", + "contentDistributionEndpoint": "", + "stagingEnvironmentPolicy": "Enabled", + "allowConfigFileUpdates": true + }, + "staticSiteResourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba28-b6d1a69ab345/resourceGroups/br-rg-34a11027-8e29-41c2-bdae-7ac642b6c4dc/providers/Microsoft.Web/staticSites/testSite2" } ] }