diff --git a/.devcontainer/contributor/devcontainer.json b/.devcontainer/contributor/devcontainer.json index e61f5b8ece5..5f6f19eb27f 100644 --- a/.devcontainer/contributor/devcontainer.json +++ b/.devcontainer/contributor/devcontainer.json @@ -1,50 +1,50 @@ { - "name": "Radius - Contributor", - // For details see https://github.com/radius-project/radius/tree/main/docs/contributing/contributing-code/contributing-code-prerequisites - "image": "mcr.microsoft.com/devcontainers/base:ubuntu", - "features": { - //Git and GitHub Setup - "ghcr.io/devcontainers/features/git:1": {}, - "ghcr.io/devcontainers/features/github-cli:1": {}, - //Programming languages - "ghcr.io/devcontainers/features/go:1": {}, - "ghcr.io/guiyomh/features/gotestsum:0.1.1": {}, - "ghcr.io/devcontainers/features/node:1": {}, - "ghcr.io/devcontainers-contrib/features/typescript:2": {}, - "ghcr.io/devcontainers/features/python:1": {}, - //Container and K8s - "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": { - "minikube": "none" - }, - "ghcr.io/devcontainers/features/docker-in-docker:2": { - "version": "latest", - "moby": true - }, - //Tools - "ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {}, - "ghcr.io/mpriscella/features/kind:1": {}, - "ghcr.io/dhoeric/features/stern:1": {}, - //Dapr - "ghcr.io/dapr/cli/dapr-cli:0": {} + "name": "Radius - Contributor", + // For details see https://github.com/radius-project/radius/tree/main/docs/contributing/contributing-code/contributing-code-prerequisites + "image": "mcr.microsoft.com/devcontainers/base:ubuntu", + "features": { + //Git and GitHub Setup + "ghcr.io/devcontainers/features/git:1": {}, + "ghcr.io/devcontainers/features/github-cli:1": {}, + //Programming languages + "ghcr.io/devcontainers/features/go:1": {}, + "ghcr.io/guiyomh/features/gotestsum:0.1.1": {}, + "ghcr.io/devcontainers/features/node:1": {}, + "ghcr.io/devcontainers-contrib/features/typescript:2": {}, + "ghcr.io/devcontainers/features/python:1": {}, + //Container and K8s + "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": { + "minikube": "none" }, - "customizations": { - "vscode": { - "extensions": [ - "redhat.vscode-yaml", - "golang.go", - "ms-python.python", - "ms-python.vscode-pylance", - "ms-azuretools.vscode-bicep", - "ms-kubernetes-tools.vscode-kubernetes-tools", - "ms-azuretools.vscode-dapr", - "ms-vscode.makefile-tools" - ] - } + "ghcr.io/devcontainers/features/docker-in-docker:2": { + "version": "latest", + "moby": true }, - // Prerequisite for Code Generation, see https://github.com/radius-project/radius/tree/main/docs/contributing/contributing-code/contributing-code-prerequisites#code-generation - // Adding workspace as safe directory to avoid permission issues - "postCreateCommand": "git config --global --add safe.directory /workspaces/radius && cd typespec && npm ci && npm install -g autorest && npm install -g oav && go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.0 && go install go.uber.org/mock/mockgen@v0.4.0", - "hostRequirements": { - "memory": "8gb" - }, -} \ No newline at end of file + //Tools + "ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {}, + "ghcr.io/mpriscella/features/kind:1": {}, + "ghcr.io/dhoeric/features/stern:1": {}, + //Dapr + "ghcr.io/dapr/cli/dapr-cli:0": {} + }, + "customizations": { + "vscode": { + "extensions": [ + "redhat.vscode-yaml", + "golang.go", + "ms-python.python", + "ms-python.vscode-pylance", + "ms-azuretools.vscode-bicep", + "ms-kubernetes-tools.vscode-kubernetes-tools", + "ms-azuretools.vscode-dapr", + "ms-vscode.makefile-tools" + ] + } + }, + // Prerequisite for Code Generation, see https://github.com/radius-project/radius/tree/main/docs/contributing/contributing-code/contributing-code-prerequisites#code-generation + // Adding workspace as safe directory to avoid permission issues + "postCreateCommand": "git config --global --add safe.directory /workspaces/radius && cd typespec && npm ci && npm install -g autorest && npm install -g oav && go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.0 && go install go.uber.org/mock/mockgen@v0.4.0", + "hostRequirements": { + "memory": "8gb" + } +} diff --git a/.github/scripts/radius-bot.js b/.github/scripts/radius-bot.js index 72c6a55e9a9..70a0e5ac8ce 100644 --- a/.github/scripts/radius-bot.js +++ b/.github/scripts/radius-bot.js @@ -15,39 +15,44 @@ limitations under the License. */ module.exports = async ({ github, context }) => { - if (context.eventName === 'issue_comment' && context.payload.action === 'created') { - try { - await handleIssueCommentCreate({ github, context }); - } catch (error) { - console.log(`[handleIssueCommentCreate] unexpected error: ${error}`); - } + if ( + context.eventName === "issue_comment" && + context.payload.action === "created" + ) { + try { + await handleIssueCommentCreate({ github, context }); + } catch (error) { + console.log(`[handleIssueCommentCreate] unexpected error: ${error}`); } -} + } +}; // Handle issue comment create event. async function handleIssueCommentCreate({ github, context }) { - const payload = context.payload; - const issue = context.issue; - const isFromPulls = !!payload.issue.pull_request; - const commentBody = payload.comment.body; - const username = context.actor; + const payload = context.payload; + const issue = context.issue; + const isFromPulls = !!payload.issue.pull_request; + const commentBody = payload.comment.body; + const username = context.actor; - if (!commentBody) { - console.log('[handleIssueCommentCreate] comment body not found, exiting.'); - return; - } + if (!commentBody) { + console.log("[handleIssueCommentCreate] comment body not found, exiting."); + return; + } - const commandParts = commentBody.split(/\s+/); - const command = commandParts.shift(); + const commandParts = commentBody.split(/\s+/); + const command = commandParts.shift(); - switch (command) { - case '/assign': - await cmdAssign(github, issue, isFromPulls, username); - break; - default: - console.log(`[handleIssueCommentCreate] command ${command} not found, exiting.`); - break; - } + switch (command) { + case "/assign": + await cmdAssign(github, issue, isFromPulls, username); + break; + default: + console.log( + `[handleIssueCommentCreate] command ${command} not found, exiting.`, + ); + break; + } } /** @@ -58,18 +63,22 @@ async function handleIssueCommentCreate({ github, context }) { * @param {*} username is the user who trigger the command */ async function cmdAssign(github, issue, isFromPulls, username) { - if (isFromPulls) { - console.log('[cmdAssign] pull requests not supported, skipping command execution.'); - return; - } else if (issue.assignees && issue.assignees.length !== 0) { - console.log('[cmdAssign] issue already has assignees, skipping command execution.'); - return; - } + if (isFromPulls) { + console.log( + "[cmdAssign] pull requests not supported, skipping command execution.", + ); + return; + } else if (issue.assignees && issue.assignees.length !== 0) { + console.log( + "[cmdAssign] issue already has assignees, skipping command execution.", + ); + return; + } - await github.rest.issues.addAssignees({ - owner: issue.owner, - repo: issue.repo, - issue_number: issue.number, - assignees: [username], - }); + await github.rest.issues.addAssignees({ + owner: issue.owner, + repo: issue.repo, + issue_number: issue.number, + assignees: [username], + }); } diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 017b50f0450..9d254c8bb2f 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -46,7 +46,7 @@ jobs: - name: Setup NodeJS uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" - name: Install TypeSpec compiler run: | pushd typespec diff --git a/.github/workflows/prettier.yaml b/.github/workflows/prettier.yaml new file mode 100644 index 00000000000..89cbb3757ef --- /dev/null +++ b/.github/workflows/prettier.yaml @@ -0,0 +1,49 @@ +# ------------------------------------------------------------ +# Copyright 2023 The Radius Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ------------------------------------------------------------ + +name: Check code formatting is up-to-date + +on: + pull_request: + branches: + - main + - release/* + +concurrency: + group: prettier-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + +jobs: + prettier-check: + name: Prettier + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Check out repo + uses: actions/checkout@v4 + - name: Setup NodeJS + uses: actions/setup-node@v4 + with: + node-version: "22" + - name: Run `make prettier-check` + id: prettier-check + run: | + make prettier-check + - name: Check for Prettier failures + if: steps.prettier-check.outcome == 'failure' + run: | + echo "Prettier check failed. Please fix the formatting issues." + exit 1 diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000000..b7804f75e5c --- /dev/null +++ b/.prettierignore @@ -0,0 +1,8 @@ +# .prettierignore +pkg/validator/testdata/put-environments-invalid-json.json + +hack/bicep-types-radius/generated/* + +bicep-types/* + +swagger/* diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 504127e64ba..9a8fcc59954 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,13 @@ # Contributing -Radius is in an early phase of development right now. We welcome feedback in the form of issues that comes from usage and is aligned with the current scope and goals of the project. +Radius is in an early phase of development right now. We welcome feedback in the form of issues that comes from usage and is aligned with the current scope and goals of the project. ## Table of contents You can find our full **contributor documentation** including instructions at the following links: - [How to contribute](./docs/contributing/how-to.md) -- [See "good first issues"](https://github.com/radius-project/radius/issues?q=is:issue+is:open+label:%22good+first+issue%22) +- [See "good first issues"](https://github.com/radius-project/radius/issues?q=is:issue+is:open+label:%22good+first+issue%22) - [Install prerequisites](./docs/contributing/contributing-code/contributing-code-prerequisites/) - [Create your first commit (full walkthrough)](./docs/contributing/contributing-code/contributing-code-first-commit/) - [Building the repo](./docs/contributing/contributing-code/contributing-code-building/) @@ -21,7 +21,7 @@ You can find our full **contributor documentation** including instructions at th We welcome small pull request contributions from anyone (docs improvements, bug fixes, minor features.) as long as they follow a few guidelines: -- For very minor changes like correcting a typo feel free to send a pull request. Otherwise ... +- For very minor changes like correcting a typo feel free to send a pull request. Otherwise ... - Please start by [choosing an existing issue](https://github.com/radius-project/radius/issues), or [opening an issue](https://github.com/radius-project/radius/issues/new/choose) to work on. - The maintainers will respond to your issue, please work with the maintainers to ensure that what you're doing is in scope for the project before writing any code. - If you have any doubt whether a contribution would be valuable, feel free to ask. diff --git a/Makefile b/Makefile index 9a69757f0f3..e19949f16bc 100644 --- a/Makefile +++ b/Makefile @@ -17,4 +17,4 @@ ARROW := \033[34;1m=>\033[0m # order matters for these -include build/help.mk build/version.mk build/build.mk build/util.mk build/generate.mk build/test.mk build/docker.mk build/recipes.mk build/install.mk build/db.mk build/debug.mk +include build/help.mk build/version.mk build/build.mk build/util.mk build/generate.mk build/test.mk build/docker.mk build/recipes.mk build/install.mk build/db.mk build/debug.mk build/prettier.mk \ No newline at end of file diff --git a/build/prettier.mk b/build/prettier.mk new file mode 100644 index 00000000000..6e27ffd3dad --- /dev/null +++ b/build/prettier.mk @@ -0,0 +1,31 @@ +# ------------------------------------------------------------ +# Copyright 2023 The Radius Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ------------------------------------------------------------ + +.PHONY: prettier-check prettier-format me prettier + +PRETTIER_VERSION := 3.3.3 + +prettier-check: + @npx prettier@$(PRETTIER_VERSION) --check "*/**/*.{ts,js,mjs,json}" + +prettier-format: + @npx prettier@$(PRETTIER_VERSION) --write "*/**/*.{ts,js,mjs,json}" + +me: + @echo "🪄💄🪄💄🪄💄" + +prettier: + @npx prettier@$(PRETTIER_VERSION) --write "*/**/*.{ts,js,mjs,json}" \ No newline at end of file diff --git a/deploy/devcontainer-feature/src/radcli/devcontainer-feature.json b/deploy/devcontainer-feature/src/radcli/devcontainer-feature.json index 8d9be59d8a1..264decb49c0 100644 --- a/deploy/devcontainer-feature/src/radcli/devcontainer-feature.json +++ b/deploy/devcontainer-feature/src/radcli/devcontainer-feature.json @@ -1,21 +1,18 @@ { - "name": "Radius CLI", - "id": "radcli", - "version": "0.1.0", - "dependsOn": { - "ghcr.io/dhoeric/features/oras:1": {} - }, - "description": "Installs the Radius CLI along with needed dependencies.", - "documentationURL": "https://docs.radapp.io/installation/", - "options": { - "version": { - "type": "string", - "proposals": [ - "latest", - "edge" - ], - "default": "latest", - "description": "Select or enter an Radius CLI version. Use 'latest' for the latest stable version, 'edge' for the latest development version, or a specific version number (e.g. 0.28.0)." - } + "name": "Radius CLI", + "id": "radcli", + "version": "0.1.0", + "dependsOn": { + "ghcr.io/dhoeric/features/oras:1": {} + }, + "description": "Installs the Radius CLI along with needed dependencies.", + "documentationURL": "https://docs.radapp.io/installation/", + "options": { + "version": { + "type": "string", + "proposals": ["latest", "edge"], + "default": "latest", + "description": "Select or enter an Radius CLI version. Use 'latest' for the latest stable version, 'edge' for the latest development version, or a specific version number (e.g. 0.28.0)." } -} \ No newline at end of file + } +} diff --git a/deploy/devcontainer-feature/test/radcli/scenarios.json b/deploy/devcontainer-feature/test/radcli/scenarios.json index c87df54b0eb..a64d46e8948 100644 --- a/deploy/devcontainer-feature/test/radcli/scenarios.json +++ b/deploy/devcontainer-feature/test/radcli/scenarios.json @@ -1,18 +1,18 @@ { - "edge": { - "image": "mcr.microsoft.com/devcontainers/base:ubuntu", - "features": { - "radcli": { - "version": "edge" - } - } - }, - "version": { - "image": "mcr.microsoft.com/devcontainers/base:ubuntu", - "features": { - "radcli": { - "version": "0.27.0" - } - } + "edge": { + "image": "mcr.microsoft.com/devcontainers/base:ubuntu", + "features": { + "radcli": { + "version": "edge" + } } -} \ No newline at end of file + }, + "version": { + "image": "mcr.microsoft.com/devcontainers/base:ubuntu", + "features": { + "radcli": { + "version": "0.27.0" + } + } + } +} diff --git a/docs/contributing/contributing-code/contributing-code-building/README.md b/docs/contributing/contributing-code/contributing-code-building/README.md index 69868dbaa32..9807df98c20 100644 --- a/docs/contributing/contributing-code/contributing-code-building/README.md +++ b/docs/contributing/contributing-code/contributing-code-building/README.md @@ -14,6 +14,12 @@ The following command will build, run unit tests, and run linters. This command make build test lint ``` +You should also run `make me prettier` if you have added new or changed existing TS, JS, MJS, and/or JSON files. + +```sh +make me prettier +``` + - See further information about tests [here](../contributing-code-tests/). - See further information about linking [here](../contributing-code-writing/). diff --git a/docs/contributing/contributing-code/contributing-code-prerequisites/README.md b/docs/contributing/contributing-code/contributing-code-prerequisites/README.md index ccf9677e4a0..f592e98bdca 100644 --- a/docs/contributing/contributing-code/contributing-code-prerequisites/README.md +++ b/docs/contributing/contributing-code/contributing-code-prerequisites/README.md @@ -22,7 +22,7 @@ If you get stuck with any development setup option, please ask for help in our [ ## Development environment - setup options -The following sections describe the aforementioned alternatives of development setups in more detail. We recommend to use of *GitHub Codespaces* or *dev containers* in VS Code as they are the most convenient way to get started. +The following sections describe the aforementioned alternatives of development setups in more detail. We recommend to use of _GitHub Codespaces_ or _dev containers_ in VS Code as they are the most convenient way to get started. ### GitHub Codespaces @@ -30,9 +30,10 @@ The easiest way to get started is using our pre-built GitHub Codespace. The steps to execute are: -1. Press this button - - [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=340522752&skip_quickstart=true&machine=basicLinux32gb&devcontainer_path=.devcontainer%2Fcontributor%2Fdevcontainer.json&geo=UsWest) +1. Press this button + + [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=340522752&skip_quickstart=true&machine=basicLinux32gb&devcontainer_path=.devcontainer%2Fcontributor%2Fdevcontainer.json&geo=UsWest) + 1. There is no second step - you are ready to contribute 😎 > **Note** - When using GitHub Codespaces cost can occur on your side after you have used up the monthly included storage and core hours for your account. You find more details [here](https://docs.github.com/en/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces). @@ -45,19 +46,19 @@ To use the dev container you must have the following tools installed and running - [Dev Container Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) - [Docker](https://docs.docker.com/engine/install/) -> 📝 **Tip** - If you are new to *dev containers* you find more information about developing inside a container [here](https://code.visualstudio.com/docs/devcontainers/containers) and a comprehensive tutorial [here](https://code.visualstudio.com/docs/devcontainers/tutorial). +> 📝 **Tip** - If you are new to _dev containers_ you find more information about developing inside a container [here](https://code.visualstudio.com/docs/devcontainers/containers) and a comprehensive tutorial [here](https://code.visualstudio.com/docs/devcontainers/tutorial). To get the dev container up and running -1. If not already done, clone your fork of the Project Radius repository to your local file system and open the folder with VS Code. The best way to do so is either to launch VS Code and open the folder via the *File* -> *Open Folder* menu or to start VS Code from the command shell with `code .`, which opens the current directory as a folder in VS Code. +1. If not already done, clone your fork of the Project Radius repository to your local file system and open the folder with VS Code. The best way to do so is either to launch VS Code and open the folder via the _File_ -> _Open Folder_ menu or to start VS Code from the command shell with `code .`, which opens the current directory as a folder in VS Code. 1. Click the "X"-like button in VS Code to open a remote window - ![Button for opening remote window command palette](img/vscode-devcontainer-open-remote-button.png) + ![Button for opening remote window command palette](img/vscode-devcontainer-open-remote-button.png) 1. Select the option "Reopen in Container" in the command palette - ![Remote window command palette](img/vscode-cmd-palette-container.png) + ![Remote window command palette](img/vscode-cmd-palette-container.png) The dev container will be started automatically. @@ -86,7 +87,7 @@ Alternatively, you can choose whichever editor you are most comfortable for work - [Visual Studio Code](https://code.visualstudio.com/) - [Go extension](https://marketplace.visualstudio.com/items?itemName=golang.go) -Install both of these and then follow the steps in the *Quick Start* for the Go extension. +Install both of these and then follow the steps in the _Quick Start_ for the Go extension. The extension will walk you through an automated install of some additional tools that match your installed version of Go. @@ -99,11 +100,11 @@ This is the list of core dependencies to install for the most common tasks. In g - [Node.js](https://nodejs.org/en/) - [Python](https://www.python.org/downloads/) - [Golangci-lint](https://golangci-lint.run/usage/install/#local-installation) -- [jq](https://jqlang.github.io/jq/download/) +- [jq](https://jqlang.github.io/jq/download/) - Make For `make` we advice the following installation steps depending on you OS. - + #### Linux Install the `build-essential` package: @@ -116,17 +117,17 @@ sudo apt-get install build-essential Using Xcode: -```bash +```bash xcode-select --install ``` Using Homebrew: -```bash +```bash brew install make ``` -To build our containers, you also need [Docker](https://docs.docker.com/engine/install/). +To build our containers, you also need [Docker](https://docs.docker.com/engine/install/). ### Additional tools diff --git a/docs/contributing/contributing-code/contributing-code-schema-changes/README.md b/docs/contributing/contributing-code/contributing-code-schema-changes/README.md index 8863be32b7e..be192f2146a 100644 --- a/docs/contributing/contributing-code/contributing-code-schema-changes/README.md +++ b/docs/contributing/contributing-code/contributing-code-schema-changes/README.md @@ -35,7 +35,7 @@ In order to update or create a new schema follow these steps: 1. Add any necessary changes to the Radius resource provider to support the newly added types. 1. Add any necessary tests, as needed. -1. Open a pull request in the Radius repo. +1. Open a pull request in the Radius repo. ## Step 2: Update docs and samples @@ -51,19 +51,20 @@ Visit the [docs](https://github.com/radius-project/docs/) and [samples](https:// # Testing schema changes locally -If you would like to test that your schema changes are compilable in a Bicep template, you can do so by publishing them to a file system using the [Bicep CLI](https://learn.microsoft.com/en-us/azure/azure-resource-manager/bicep/). +If you would like to test that your schema changes are compilable in a Bicep template, you can do so by publishing them to a file system using the [Bicep CLI](https://learn.microsoft.com/en-us/azure/azure-resource-manager/bicep/). ## Step 1: Download the Bicep CLI -1. Follow the steps in the Bicep [documentation](https://learn.microsoft.com/en-us/azure/azure-resource-manager/bicep/install) to download Bicep. +1. Follow the steps in the Bicep [documentation](https://learn.microsoft.com/en-us/azure/azure-resource-manager/bicep/install) to download Bicep. Note: Alternatively, if you already have the Radius CLI installed, you can choose to use the Bicep binary that is installed as part of Radius. The Bicep binary gets downloaded to `./.rad/bin/rad-bicep`. You can use this file path instead. ## Step 2: Create a file directory -1. Create a file directory in your location of choice. Keep the directory path handy for the next steps. +1. Create a file directory in your location of choice. Keep the directory path handy for the next steps. ## Step 3: Upload the new schema types to the file directory + 1. Run `make generate` to generate the OpenAPI spec and API clients: ```bash @@ -71,7 +72,7 @@ Note: Alternatively, if you already have the Radius CLI installed, you can choos ``` 1. `cd` into the `hack/bicep-types-radius/generated` folder -1. Run `bicep publish-provider --target ` to upload the schema changes to your file system. The file uploaded will be the `index.json` file as it contains all references to the types schema. The `` can be named as desired, but we recommend using an archive (i.e. `.zip`, `.tgz`, etc). This will make it easier to view the files that get uploaded if needed. +1. Run `bicep publish-provider --target ` to upload the schema changes to your file system. The file uploaded will be the `index.json` file as it contains all references to the types schema. The `` can be named as desired, but we recommend using an archive (i.e. `.zip`, `.tgz`, etc). This will make it easier to view the files that get uploaded if needed. ```bash bicep publish-extension index.json --target / @@ -79,7 +80,8 @@ Note: Alternatively, if you already have the Radius CLI installed, you can choos ## Step 4: Update the `bicepconfig.json` to use your newly published types -1. Update the `bicepconfig.json` file in the root folder to reference your new published types. +1. Update the `bicepconfig.json` file in the root folder to reference your new published types. + ```json { "experimentalFeaturesEnabled": { @@ -93,6 +95,7 @@ Note: Alternatively, if you already have the Radius CLI installed, you can choos } } ``` -1. Once Bicep restores the new extensions, you should be able to use the new schema changes in your Bicep templates. -Note: You can also choose to publish the types to an OCI registry. The `--target` field will be your OCI registry endpoint when running the `bicep publish-extension` command. Make sure to update the `radius` extension field with your OCI registry endpoint in the `bicepconfig.json`. \ No newline at end of file +1. Once Bicep restores the new extensions, you should be able to use the new schema changes in your Bicep templates. + +Note: You can also choose to publish the types to an OCI registry. The `--target` field will be your OCI registry endpoint when running the `bicep publish-extension` command. Make sure to update the `radius` extension field with your OCI registry endpoint in the `bicepconfig.json`. diff --git a/docs/contributing/contributing-pull-requests/README.md b/docs/contributing/contributing-pull-requests/README.md index 5558b36a041..4439a2a2db3 100644 --- a/docs/contributing/contributing-pull-requests/README.md +++ b/docs/contributing/contributing-pull-requests/README.md @@ -4,7 +4,7 @@ We welcome small pull request contributions from anyone (docs improvements, bug fixes, minor features.) as long as they follow a few guidelines: -- For very minor changes like correcting a typo feel free to just send a pull request without any ceremony. Otherwise ... +- For very minor changes like correcting a typo feel free to just send a pull request without any ceremony. Otherwise ... - Please start by [choosing an existing issue](https://github.com/radius-project/radius/issues), or [opening an issue](https://github.com/radius-project/radius/issues/new/choose) to work on. - The maintainers will respond to your issue, please work with the maintainers to ensure that what you're doing is in scope for the project before writing any code. - If you have any doubt whether a contribution would be valuable, feel free to ask. @@ -46,8 +46,8 @@ Keep reading for some tips about how to get your pull requests accepted! ## How to get help with a pull request -* Notify the Radius Core team by commenting with `@radius-project/radius-core-team ` on your pull-request. -* Post on Discord in the [#Forum channel](https://discord.gg/GJHN7kQrMh) to start a conversation. +- Notify the Radius Core team by commenting with `@radius-project/radius-core-team` on your pull-request. +- Post on Discord in the [#Forum channel](https://discord.gg/GJHN7kQrMh) to start a conversation. ## Writing a good commit message @@ -84,12 +84,11 @@ We run [CodeQL](https://codeql.github.com/) as part of the pull-request process If CodeQL fails due to your changes, please work with the maintainers to resolve the issue. - ## Code review The maintainers or other contributors will add comments to your pull request giving feedback, asking questions, and making suggestions. Please respond to these comments to either continue the discussion or explain whether or not you plan to address the feedback. Ultimately, accepting a pull request is at the maintainer's discretion. -### Being proactive +### Being proactive It can be helpful for you to comment on your own PR to point out relevant locations, decisions, opportunities for feedback, and tricky parts. This will help reviewers focus their attention as well as save them time. @@ -107,4 +106,4 @@ See the [code reviewing documentation](../contributing-code/contributing-code-re ## Inactive Pull Requests -Pull requests that have been inactive for 90 days will be marked with a stale label. They will automatically be closed after a subsequent 7 days of inactivity. This timeframe may be adjusted in the future based on project needs. \ No newline at end of file +Pull requests that have been inactive for 90 days will be marked with a stale label. They will automatically be closed after a subsequent 7 days of inactivity. This timeframe may be adjusted in the future based on project needs. diff --git a/grafana/radius-overview-dashboard.json b/grafana/radius-overview-dashboard.json index bc0f4934550..a1d7ce6f53a 100644 --- a/grafana/radius-overview-dashboard.json +++ b/grafana/radius-overview-dashboard.json @@ -82,9 +82,7 @@ "justifyMode": "auto", "orientation": "auto", "reduceOptions": { - "calcs": [ - "last" - ], + "calcs": ["last"], "fields": "", "values": false }, @@ -626,9 +624,7 @@ "options": { "orientation": "vertical", "reduceOptions": { - "calcs": [ - "min" - ], + "calcs": ["min"], "fields": "", "values": false }, @@ -1511,4 +1507,4 @@ "uid": "Wh5JpyxVz", "version": 5, "weekStart": "" -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/autorest.bicep/.eslintrc.js b/hack/bicep-types-radius/src/autorest.bicep/.eslintrc.js index db51460f094..0d0f072e523 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/.eslintrc.js +++ b/hack/bicep-types-radius/src/autorest.bicep/.eslintrc.js @@ -18,7 +18,7 @@ module.exports = { parser: "@typescript-eslint/parser", parserOptions: { ecmaVersion: 2020, - sourceType: "module", + sourceType: "module" }, plugins: ["header"], extends: ["eslint:recommended"], @@ -29,31 +29,28 @@ module.exports = { "line", [ " Copyright 2023 The Radius Authors.", - " # ------------------------------------------------------------ - ], - ], + " # ------------------------------------------------------------" + ] + ] }, overrides: [ { files: ["*.ts"], - extends: [ - "plugin:@typescript-eslint/recommended", - "plugin:jest/all", - ], + extends: ["plugin:@typescript-eslint/recommended", "plugin:jest/all"], rules: { "jest/no-hooks": "off", "jest/prefer-expect-assertions": "off", "jest/expect-expect": [ "error", { - assertFunctionNames: ["expect*"], - }, - ], - }, + assertFunctionNames: ["expect*"] + } + ] + } }, { files: ["*.js"], - env: { node: true }, - }, - ], + env: { node: true } + } + ] }; diff --git a/hack/bicep-types-radius/src/autorest.bicep/jest.config.ts b/hack/bicep-types-radius/src/autorest.bicep/jest.config.ts index 83522790011..67806186fa6 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/jest.config.ts +++ b/hack/bicep-types-radius/src/autorest.bicep/jest.config.ts @@ -15,15 +15,10 @@ // ------------------------------------------------------------. module.exports = { verbose: true, - moduleFileExtensions: [ - "ts", - "js" - ], + moduleFileExtensions: ["ts", "js"], transform: { - '^.+\\.(ts|tsx)$': 'ts-jest' + "^.+\\.(ts|tsx)$": "ts-jest" }, - testMatch: [ - '**/test/**/*.test.(ts)' - ], - testEnvironment: 'node', -}; \ No newline at end of file + testMatch: ["**/test/**/*.test.(ts)"], + testEnvironment: "node" +}; diff --git a/hack/bicep-types-radius/src/autorest.bicep/package.json b/hack/bicep-types-radius/src/autorest.bicep/package.json index d4289f6e607..fe42fc5dc87 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/package.json +++ b/hack/bicep-types-radius/src/autorest.bicep/package.json @@ -32,4 +32,4 @@ "typescript": "^5.6.3", "bicep-types": "file:../../../../bicep-types/src/bicep-types" } -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/autorest.bicep/src/main.ts b/hack/bicep-types-radius/src/autorest.bicep/src/main.ts index c1c3053fe1e..17273b22606 100755 --- a/hack/bicep-types-radius/src/autorest.bicep/src/main.ts +++ b/hack/bicep-types-radius/src/autorest.bicep/src/main.ts @@ -14,13 +14,22 @@ // limitations under the License. // ------------------------------------------------------------. -import { AutoRestExtension, AutorestExtensionHost, startSession } from "@autorest/extension-base"; +import { + AutoRestExtension, + AutorestExtensionHost, + startSession +} from "@autorest/extension-base"; import { generateTypes } from "./type-generator"; import { CodeModel, codeModelSchema } from "@autorest/codemodel"; -import { orderBy } from 'lodash'; +import { orderBy } from "lodash"; import { getProviderDefinitions } from "./resources"; -import { writeTypesJson, writeMarkdown, TypeBaseKind, ResourceType } from "bicep-types"; -import { writeTableMarkdown } from "./writers/markdown-table"; +import { + writeTypesJson, + writeMarkdown, + TypeBaseKind, + ResourceType +} from "bicep-types"; +import { writeTableMarkdown } from "./writers/markdown-table"; export async function processRequest(host: AutorestExtensionHost) { try { @@ -38,16 +47,38 @@ export async function processRequest(host: AutorestExtensionHost) { const outFolder = `${namespace}/${apiVersion}`.toLowerCase(); // write types.json - host.writeFile({ filename: `${outFolder}/types.json`, content: writeTypesJson(types) }); + host.writeFile({ + filename: `${outFolder}/types.json`, + content: writeTypesJson(types) + }); // writer types.md - host.writeFile({ filename: `${outFolder}/types.md`, content: writeMarkdown(types, `${namespace} @ ${apiVersion}`) }); + host.writeFile({ + filename: `${outFolder}/types.md`, + content: writeMarkdown(types, `${namespace} @ ${apiVersion}`) + }); // writer resource types - const resourceTypes = orderBy(types.filter(t => t.type == TypeBaseKind.ResourceType) as ResourceType[], x => x.name.split('@')[0].toLowerCase()); + const resourceTypes = orderBy( + types.filter( + (t) => t.type == TypeBaseKind.ResourceType + ) as ResourceType[], + (x) => x.name.split("@")[0].toLowerCase() + ); for (const resourceType of resourceTypes) { - const filename = resourceType.name.split('/')[1].split('@')[0].toLowerCase(); - host.writeFile({ filename: `${outFolder}/docs/${filename}.md`, content: writeTableMarkdown(namespace, apiVersion, [resourceType], types) }); + const filename = resourceType.name + .split("/")[1] + .split("@")[0] + .toLowerCase(); + host.writeFile({ + filename: `${outFolder}/docs/${filename}.md`, + content: writeTableMarkdown( + namespace, + apiVersion, + [resourceType], + types + ) + }); } } diff --git a/hack/bicep-types-radius/src/autorest.bicep/src/resources.ts b/hack/bicep-types-radius/src/autorest.bicep/src/resources.ts index f3aee82852a..4b3093f97fa 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/src/resources.ts +++ b/hack/bicep-types-radius/src/autorest.bicep/src/resources.ts @@ -14,11 +14,29 @@ // limitations under the License. // ------------------------------------------------------------. -import { ChoiceSchema, CodeModel, HttpMethod, HttpParameter, HttpRequest, HttpResponse, ImplementationLocation, ObjectSchema, Operation, Parameter, ParameterLocation, Request, Response, Schema, SchemaResponse, SealedChoiceSchema, Metadata } from "@autorest/codemodel"; +import { + ChoiceSchema, + CodeModel, + HttpMethod, + HttpParameter, + HttpRequest, + HttpResponse, + ImplementationLocation, + ObjectSchema, + Operation, + Parameter, + ParameterLocation, + Request, + Response, + Schema, + SchemaResponse, + SealedChoiceSchema, + Metadata +} from "@autorest/codemodel"; import { Channel, AutorestExtensionHost } from "@autorest/extension-base"; -import { keys, Dictionary, values, groupBy } from 'lodash'; -import { success, failure, Result } from './utils'; -import { ScopeType } from 'bicep-types'; +import { keys, Dictionary, values, groupBy } from "lodash"; +import { success, failure, Result } from "./utils"; +import { ScopeType } from "bicep-types"; export interface ResourceDescriptor { scopeType: ScopeType; @@ -51,19 +69,21 @@ export interface ResourceListActionDefinition { responseSchema?: Schema; } -const parentScopePrefix = /^.*\/providers\//ig; -const managementGroupPrefix = /^\/providers\/Microsoft.Management\/managementGroups\/{\w+}\/$/i; +const parentScopePrefix = /^.*\/providers\//gi; +const managementGroupPrefix = + /^\/providers\/Microsoft.Management\/managementGroups\/{\w+}\/$/i; const tenantPrefix = /^\/$/i; const subscriptionPrefix = /^\/subscriptions\/{\w+}\/$/i; -const resourceGroupPrefix = /^\/subscriptions\/{\w+}\/resourceGroups\/{\w+}\/$/i; +const resourceGroupPrefix = + /^\/subscriptions\/{\w+}\/resourceGroups\/{\w+}\/$/i; const resourceGroupMethod = /^\/subscriptions\/{\w+}\/resourceGroups\/{\w+}$/i; function trimScope(scope: string) { - return scope.replace(/\/*$/, '').replace(/^\/*/, ''); + return scope.replace(/\/*$/, "").replace(/^\/*/, ""); } function isPathVariable(pathSegment: string) { - return pathSegment.startsWith('{') && pathSegment.endsWith('}'); + return pathSegment.startsWith("{") && pathSegment.endsWith("}"); } function trimParamBraces(pathSegment: string) { @@ -71,7 +91,7 @@ function trimParamBraces(pathSegment: string) { } function normalizeListActionName(actionName: string) { - if (actionName.toLowerCase().startsWith('list')) { + if (actionName.toLowerCase().startsWith("list")) { // force lower-case on the 'list' prefix for consistency return `list${actionName.substr(4)}`; } @@ -80,11 +100,13 @@ function normalizeListActionName(actionName: string) { } export function getFullyQualifiedType(descriptor: ResourceDescriptor) { - return [descriptor.namespace, ...descriptor.typeSegments].join('/'); + return [descriptor.namespace, ...descriptor.typeSegments].join("/"); } function groupByType(items: T[]) { - return groupBy(items, x => getFullyQualifiedType(x.descriptor).toLowerCase()); + return groupBy(items, (x) => + getFullyQualifiedType(x.descriptor).toLowerCase() + ); } export function isRootType(descriptor: ResourceDescriptor) { @@ -92,7 +114,10 @@ export function isRootType(descriptor: ResourceDescriptor) { } function getHttpRequests(requests: Request[] | undefined) { - return requests?.map(x => x.protocol.http as HttpRequest).filter(x => !!x) ?? []; + return ( + requests?.map((x) => x.protocol.http as HttpRequest).filter((x) => !!x) ?? + [] + ); } function hasStatusCode(response: Response, statusCode: string) { @@ -113,11 +138,18 @@ function getNormalizedMethodPath(path: string) { return path; } -export function getSerializedName(metadata: Metadata) { - return metadata.language.default.serializedName ?? metadata.language.default.name; +export function getSerializedName(metadata: Metadata) { + return ( + metadata.language.default.serializedName ?? metadata.language.default.name + ); } -export function parseNameSchema(request: HttpRequest, parameters: Parameter[], parseType: (schema: Schema) => T, createConstantName: (name: string) => T): Result { +export function parseNameSchema( + request: HttpRequest, + parameters: Parameter[], + parseType: (schema: Schema) => T, + createConstantName: (name: string) => T +): Result { const path = getNormalizedMethodPath(request.path); const finalProvidersMatch = path.match(parentScopePrefix)?.slice(-1)[0]; @@ -128,13 +160,15 @@ export function parseNameSchema(request: HttpRequest, parameters: Parameter[] const routingScope = trimScope(path.substr(finalProvidersMatch.length)); // get the resource name parameter, e.g. {fooName} - let resNameParam = routingScope.substr(routingScope.lastIndexOf('/') + 1); + let resNameParam = routingScope.substr(routingScope.lastIndexOf("/") + 1); if (isPathVariable(resNameParam)) { // strip the enclosing braces resNameParam = trimParamBraces(resNameParam); - const param = parameters.filter(p => getSerializedName(p) === resNameParam)[0]; + const param = parameters.filter( + (p) => getSerializedName(p) === resNameParam + )[0]; if (!param) { return failure(`Unable to locate parameter with name '${resNameParam}'`); } @@ -149,26 +183,32 @@ export function parseNameSchema(request: HttpRequest, parameters: Parameter[] return success(createConstantName(resNameParam)); } -export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExtensionHost): ProviderDefinition[] { +export function getProviderDefinitions( + codeModel: CodeModel, + host: AutorestExtensionHost +): ProviderDefinition[] { function logWarning(message: string) { host.Message({ Channel: Channel.Warning, - Text: message, - }) + Text: message + }); } function getProviderDefinitions() { const apiVersions = codeModel.operationGroups - .flatMap(group => group.operations - .flatMap(op => (op.apiVersions ?? []).map(v => v.version))) + .flatMap((group) => + group.operations.flatMap((op) => + (op.apiVersions ?? []).map((v) => v.version) + ) + ) .filter((x, i, a) => a.indexOf(x) === i); - return apiVersions.flatMap(v => getProviderDefinitionsForApiVersion(v)); + return apiVersions.flatMap((v) => getProviderDefinitionsForApiVersion(v)); } function getProviderDefinitionsForApiVersion(apiVersion: string) { const providerDefinitions: Dictionary = {}; - const operations = codeModel.operationGroups.flatMap(x => x.operations); + const operations = codeModel.operationGroups.flatMap((x) => x.operations); const getOperationsByPath: Dictionary = {}; const putOperationsByPath: Dictionary = {}; @@ -186,17 +226,17 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten } } - operations.forEach(operation => { + operations.forEach((operation) => { const requests = getHttpRequests(operation.requests); - const getRequest = requests.filter(r => r.method === HttpMethod.Get)[0]; + const getRequest = requests.filter((r) => r.method === HttpMethod.Get)[0]; if (getRequest) { getOperationsByPath[getRequest.path.toLowerCase()] = operation; } - const putRequest = requests.filter(r => r.method === HttpMethod.Put)[0]; + const putRequest = requests.filter((r) => r.method === HttpMethod.Put)[0]; if (putRequest) { putOperationsByPath[putRequest.path.toLowerCase()] = operation; } - const postListRequest = requests.filter(r => { + const postListRequest = requests.filter((r) => { if (r.method !== HttpMethod.Post) { return false; } @@ -207,11 +247,14 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten } const { routingScope: actionRoutingScope } = parseResult.value; - const actionName = actionRoutingScope.substr(actionRoutingScope.lastIndexOf('/') + 1); - return actionName.toLowerCase().startsWith('list'); + const actionName = actionRoutingScope.substr( + actionRoutingScope.lastIndexOf("/") + 1 + ); + return actionName.toLowerCase().startsWith("list"); })[0]; if (postListRequest) { - postListOperationsByPath[postListRequest.path.toLowerCase()] = operation; + postListOperationsByPath[postListRequest.path.toLowerCase()] = + operation; } }); @@ -226,9 +269,15 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten continue; } - const parseResult = parseResourceMethod(putData.request.path, putData.parameters, apiVersion); + const parseResult = parseResourceMethod( + putData.request.path, + putData.parameters, + apiVersion + ); if (!parseResult.success) { - logWarning(`Skipping path '${putData.request.path}': ${parseResult.error}`); + logWarning( + `Skipping path '${putData.request.path}': ${parseResult.error}` + ); continue; } @@ -239,8 +288,10 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten descriptor, putRequest: putData.request, putParameters: putData.parameters, - putSchema: (putData.schema instanceof ObjectSchema) ? putData.schema : undefined, - getSchema: (getData.schema instanceof ObjectSchema) ? getData.schema : undefined, + putSchema: + putData.schema instanceof ObjectSchema ? putData.schema : undefined, + getSchema: + getData.schema instanceof ObjectSchema ? getData.schema : undefined }; const lcNamespace = descriptor.namespace.toLowerCase(); @@ -260,9 +311,15 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten continue; } - const parseResult = parseResourceActionMethod(listData.request.path, listData.parameters, apiVersion); + const parseResult = parseResourceActionMethod( + listData.request.path, + listData.parameters, + apiVersion + ); if (!parseResult.success) { - logWarning(`Skipping resource POST action path '${listData.request.path}': ${parseResult.error}`); + logWarning( + `Skipping resource POST action path '${listData.request.path}': ${parseResult.error}` + ); continue; } @@ -276,7 +333,7 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten descriptor, postRequest: listData.request, requestSchema: listData.requestSchema, - responseSchema: listData.responseSchema, + responseSchema: listData.responseSchema }; const lcNamespace = descriptor.namespace.toLowerCase(); @@ -288,14 +345,21 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten } for (const namespace of keys(providerDefinitions)) { - providerDefinitions[namespace].resourcesByType = collapseDefinitions(resourcesByProvider[namespace]); - providerDefinitions[namespace].resourceFunctions = groupByType(actionsByProvider[namespace]); + providerDefinitions[namespace].resourcesByType = collapseDefinitions( + resourcesByProvider[namespace] + ); + providerDefinitions[namespace].resourceFunctions = groupByType( + actionsByProvider[namespace] + ); } return values(providerDefinitions); } - - function getRequestSchema(operation: Operation | undefined, requests: Request[]) { + + function getRequestSchema( + operation: Operation | undefined, + requests: Request[] + ) { if (!operation || requests.length === 0) { return; } @@ -303,20 +367,26 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten for (const request of requests) { const parameters = combineParameters(operation, request); - const bodyParameter = parameters.filter(p => (p.protocol.http as HttpParameter)?.in === ParameterLocation.Body)[0]; + const bodyParameter = parameters.filter( + (p) => (p.protocol.http as HttpParameter)?.in === ParameterLocation.Body + )[0]; - if (request.protocol.http instanceof HttpRequest && bodyParameter instanceof Parameter && bodyParameter.schema) { + if ( + request.protocol.http instanceof HttpRequest && + bodyParameter instanceof Parameter && + bodyParameter.schema + ) { return { request: request.protocol.http, parameters, - schema: bodyParameter.schema, + schema: bodyParameter.schema }; } } return { - request: (requests[0].protocol.http as HttpRequest), - parameters: combineParameters(operation, requests[0]), + request: requests[0].protocol.http as HttpRequest, + parameters: combineParameters(operation, requests[0]) }; } @@ -324,8 +394,8 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten const responses = operation?.responses ?? []; const validResponses = [ // order 200 responses before default - ...responses.filter(r => hasStatusCode(r, "200")), - ...responses.filter(r => hasStatusCode(r, "default")), + ...responses.filter((r) => hasStatusCode(r, "200")), + ...responses.filter((r) => hasStatusCode(r, "default")) ]; if (!operation || validResponses.length === 0) { @@ -333,16 +403,20 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten } for (const response of validResponses) { - if (response.protocol.http instanceof HttpResponse && response instanceof SchemaResponse && response.schema) { + if ( + response.protocol.http instanceof HttpResponse && + response instanceof SchemaResponse && + response.schema + ) { return { response: response.protocol.http, - schema: response.schema, + schema: response.schema }; } } return { - response: (validResponses[0].protocol.http as HttpResponse), + response: validResponses[0].protocol.http as HttpResponse }; } @@ -356,14 +430,18 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten function getPutSchema(operation?: Operation) { const requests = operation?.requests ?? []; - const validRequests = requests.filter(r => (r.protocol.http as HttpRequest)?.method === HttpMethod.Put); + const validRequests = requests.filter( + (r) => (r.protocol.http as HttpRequest)?.method === HttpMethod.Put + ); return getRequestSchema(operation, validRequests); } function getPostSchema(operation?: Operation) { const requests = operation?.requests ?? []; - const validRequests = requests.filter(r => (r.protocol.http as HttpRequest)?.method === HttpMethod.Post); + const validRequests = requests.filter( + (r) => (r.protocol.http as HttpRequest)?.method === HttpMethod.Post + ); const response = getResponseSchema(operation); const request = getRequestSchema(operation, validRequests); @@ -376,11 +454,13 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten request: request.request, parameters: request.parameters, requestSchema: request.schema, - responseSchema: response.schema, + responseSchema: response.schema }; } - function parseResourceScopes(path: string): Result<{scopeType: ScopeType, routingScope: string}, string> { + function parseResourceScopes( + path: string + ): Result<{ scopeType: ScopeType; routingScope: string }, string> { path = getNormalizedMethodPath(path); const finalProvidersMatch = path.match(parentScopePrefix)?.slice(-1)[0]; @@ -388,7 +468,10 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten return failure(`Unable to locate "/providers/" segment`); } - const parentScope = path.substr(0, finalProvidersMatch.length - "providers/".length); + const parentScope = path.substr( + 0, + finalProvidersMatch.length - "providers/".length + ); const routingScope = trimScope(path.substr(finalProvidersMatch.length)); const scopeType = getScopeTypeFromParentScope(parentScope); @@ -396,10 +479,17 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten return success({ scopeType, routingScope }); } - function parseResourceDescriptors(parameters: Parameter[], apiVersion: string, scopeType: ScopeType, routingScope: string): Result { - const namespace = routingScope.substr(0, routingScope.indexOf('/')); + function parseResourceDescriptors( + parameters: Parameter[], + apiVersion: string, + scopeType: ScopeType, + routingScope: string + ): Result { + const namespace = routingScope.substr(0, routingScope.indexOf("/")); if (isPathVariable(namespace)) { - return failure(`Unable to process parameterized provider namespace "${namespace}"`); + return failure( + `Unable to process parameterized provider namespace "${namespace}"` + ); } const parseResult = parseResourceTypes(parameters, routingScope); @@ -407,21 +497,27 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten return parseResult; } - const resNameParam = routingScope.substr(routingScope.lastIndexOf('/') + 1); - const constantName = isPathVariable(resNameParam) ? undefined : resNameParam; + const resNameParam = routingScope.substr(routingScope.lastIndexOf("/") + 1); + const constantName = isPathVariable(resNameParam) + ? undefined + : resNameParam; - const descriptors: ResourceDescriptor[] = parseResult.value.map(type => ({ + const descriptors: ResourceDescriptor[] = parseResult.value.map((type) => ({ scopeType, namespace, typeSegments: type, apiVersion, - constantName, + constantName })); return success(descriptors); } - function parseResourceMethod(path: string, parameters: Parameter[], apiVersion: string) { + function parseResourceMethod( + path: string, + parameters: Parameter[], + apiVersion: string + ) { const resourceScopeResult = parseResourceScopes(path); if (!resourceScopeResult.success) { @@ -430,68 +526,112 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten const { scopeType, routingScope } = resourceScopeResult.value; - return parseResourceDescriptors(parameters, apiVersion, scopeType, routingScope); + return parseResourceDescriptors( + parameters, + apiVersion, + scopeType, + routingScope + ); } - function parseResourceActionMethod(path: string, parameters: Parameter[], apiVersion: string) { + function parseResourceActionMethod( + path: string, + parameters: Parameter[], + apiVersion: string + ) { const resourceScopeResult = parseResourceScopes(path); if (!resourceScopeResult.success) { return failure(resourceScopeResult.error); } - const { routingScope: actionRoutingScope, scopeType } = resourceScopeResult.value; + const { routingScope: actionRoutingScope, scopeType } = + resourceScopeResult.value; - const routingScope = actionRoutingScope.substr(0, actionRoutingScope.lastIndexOf('/')); - const actionName = actionRoutingScope.substr(actionRoutingScope.lastIndexOf('/') + 1); + const routingScope = actionRoutingScope.substr( + 0, + actionRoutingScope.lastIndexOf("/") + ); + const actionName = actionRoutingScope.substr( + actionRoutingScope.lastIndexOf("/") + 1 + ); - const resourceDescriptorsResult = parseResourceDescriptors(parameters, apiVersion, scopeType, routingScope); + const resourceDescriptorsResult = parseResourceDescriptors( + parameters, + apiVersion, + scopeType, + routingScope + ); if (!resourceDescriptorsResult.success) { return failure(resourceDescriptorsResult.error); } - return success({ + return success({ descriptors: resourceDescriptorsResult.value, - actionName: actionName, + actionName: actionName }); } - function parseResourceTypes(parameters: Parameter[], routingScope: string): Result { - const typeSegments = routingScope.split('/').slice(1).filter((_, i) => i % 2 === 0); - const nameSegments = routingScope.split('/').slice(1).filter((_, i) => i % 2 === 1); + function parseResourceTypes( + parameters: Parameter[], + routingScope: string + ): Result { + const typeSegments = routingScope + .split("/") + .slice(1) + .filter((_, i) => i % 2 === 0); + const nameSegments = routingScope + .split("/") + .slice(1) + .filter((_, i) => i % 2 === 1); if (typeSegments.length === 0) { return failure(`Unable to find type segments`); } if (typeSegments.length !== nameSegments.length) { - return failure(`Found mismatch between type segments (${typeSegments.length}) and name segments (${nameSegments.length})`); + return failure( + `Found mismatch between type segments (${typeSegments.length}) and name segments (${nameSegments.length})` + ); } let resourceTypes: string[][] = [[]]; for (const typeSegment of typeSegments) { if (isPathVariable(typeSegment)) { const parameterName = trimParamBraces(typeSegment); - const parameter = parameters.filter(p => - p.implementation === ImplementationLocation.Method && - getSerializedName(p) === parameterName)[0]; + const parameter = parameters.filter( + (p) => + p.implementation === ImplementationLocation.Method && + getSerializedName(p) === parameterName + )[0]; if (!parameter) { return failure(`Found undefined parameter reference ${typeSegment}`); } const choiceSchema = parameter.schema; - if (!(choiceSchema instanceof ChoiceSchema || choiceSchema instanceof SealedChoiceSchema)) { - return failure(`Parameter reference ${typeSegment} is not defined as an enum`); - } + if ( + !( + choiceSchema instanceof ChoiceSchema || + choiceSchema instanceof SealedChoiceSchema + ) + ) { + return failure( + `Parameter reference ${typeSegment} is not defined as an enum` + ); + } if (choiceSchema.choices.length === 0) { - return failure(`Parameter reference ${typeSegment} is defined as an enum, but doesn't have any specified values`); + return failure( + `Parameter reference ${typeSegment} is defined as an enum, but doesn't have any specified values` + ); } - resourceTypes = resourceTypes.flatMap(type => choiceSchema.choices.map(v => [...type, v.value.toString()])); + resourceTypes = resourceTypes.flatMap((type) => + choiceSchema.choices.map((v) => [...type, v.value.toString()]) + ); } else { - resourceTypes = resourceTypes.map(type => [...type, typeSegment]); + resourceTypes = resourceTypes.map((type) => [...type, typeSegment]); } } @@ -536,7 +676,7 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten function collapseDefinitionScopes(resources: ResourceDefinition[]) { const definitionsByName: Dictionary = {}; for (const resource of resources) { - const name = resource.descriptor.constantName ?? ''; + const name = resource.descriptor.constantName ?? ""; if (definitionsByName[name]) { const curDescriptor = definitionsByName[name].descriptor; const newDescriptor = resource.descriptor; @@ -545,8 +685,11 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten ...definitionsByName[name], descriptor: { ...curDescriptor, - scopeType: mergeScopes(curDescriptor.scopeType, newDescriptor.scopeType), - }, + scopeType: mergeScopes( + curDescriptor.scopeType, + newDescriptor.scopeType + ) + } }; } else { definitionsByName[name] = resource; @@ -558,10 +701,12 @@ export function getProviderDefinitions(codeModel: CodeModel, host: AutorestExten function collapseDefinitions(resources: ResourceDefinition[]) { const resourcesByType = groupByType(resources); - const collapsedResources = Object.values(resourcesByType).flatMap(collapseDefinitionScopes); + const collapsedResources = Object.values(resourcesByType).flatMap( + collapseDefinitionScopes + ); return groupByType(collapsedResources); } return getProviderDefinitions(); -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/autorest.bicep/src/type-generator.ts b/hack/bicep-types-radius/src/autorest.bicep/src/type-generator.ts index 2f436d69b2e..233341b3c59 100755 --- a/hack/bicep-types-radius/src/autorest.bicep/src/type-generator.ts +++ b/hack/bicep-types-radius/src/autorest.bicep/src/type-generator.ts @@ -14,67 +14,140 @@ // limitations under the License. // ------------------------------------------------------------. -import { AnySchema, ArraySchema, ChoiceSchema, ConstantSchema, DictionarySchema, ObjectSchema, PrimitiveSchema, Property, Schema, SchemaType, SealedChoiceSchema, StringSchema } from "@autorest/codemodel"; +import { + AnySchema, + ArraySchema, + ChoiceSchema, + ConstantSchema, + DictionarySchema, + ObjectSchema, + PrimitiveSchema, + Property, + Schema, + SchemaType, + SealedChoiceSchema, + StringSchema +} from "@autorest/codemodel"; import { Channel, AutorestExtensionHost } from "@autorest/extension-base"; -import { DiscriminatedObjectType, ObjectType, ObjectTypeProperty, ObjectTypePropertyFlags, TypeBaseKind, TypeFactory, TypeReference, ResourceFlags, ResourceTypeFunction, FunctionParameter } from "bicep-types"; -import { uniq, keys, keyBy, Dictionary, flatMap } from 'lodash'; -import { getFullyQualifiedType, getSerializedName, parseNameSchema, ProviderDefinition, ResourceDefinition, ResourceDescriptor } from "./resources"; - -export function generateTypes(host: AutorestExtensionHost, definition: ProviderDefinition) { +import { + DiscriminatedObjectType, + ObjectType, + ObjectTypeProperty, + ObjectTypePropertyFlags, + TypeBaseKind, + TypeFactory, + TypeReference, + ResourceFlags, + ResourceTypeFunction, + FunctionParameter +} from "bicep-types"; +import { uniq, keys, keyBy, Dictionary, flatMap } from "lodash"; +import { + getFullyQualifiedType, + getSerializedName, + parseNameSchema, + ProviderDefinition, + ResourceDefinition, + ResourceDescriptor +} from "./resources"; + +export function generateTypes( + host: AutorestExtensionHost, + definition: ProviderDefinition +) { const factory = new TypeFactory(); const namedDefinitions: Dictionary = {}; function logWarning(message: string) { - host.message({ Channel: Channel.Warning, Text: message, }); + host.message({ Channel: Channel.Warning, Text: message }); } function logInfo(message: string) { - host.message({ Channel: Channel.Information, Text: message, }); + host.message({ Channel: Channel.Information, Text: message }); } - function processResourceBody(fullyQualifiedType: string, definition: ResourceDefinition) { - const { descriptor, putRequest, putParameters, putSchema, getSchema, } = definition; + function processResourceBody( + fullyQualifiedType: string, + definition: ResourceDefinition + ) { + const { descriptor, putRequest, putParameters, putSchema, getSchema } = + definition; const nameSchemaResult = parseNameSchema( putRequest, putParameters, - schema => parseType(schema, schema), - (name) => factory.addStringLiteralType(name)); + (schema) => parseType(schema, schema), + (name) => factory.addStringLiteralType(name) + ); if (!nameSchemaResult.success) { - logWarning(`Skipping resource type ${fullyQualifiedType} under path '${putRequest.path}': ${nameSchemaResult.error}`); - return + logWarning( + `Skipping resource type ${fullyQualifiedType} under path '${putRequest.path}': ${nameSchemaResult.error}` + ); + return; } if (!nameSchemaResult.value) { - logWarning(`Skipping resource type ${fullyQualifiedType} under path '${putRequest.path}': failed to obtain a name value`); - return + logWarning( + `Skipping resource type ${fullyQualifiedType} under path '${putRequest.path}': failed to obtain a name value` + ); + return; } - const resourceProperties = getStandardizedResourceProperties(descriptor, nameSchemaResult.value); + const resourceProperties = getStandardizedResourceProperties( + descriptor, + nameSchemaResult.value + ); let resourceDefinition: TypeReference; if (putSchema) { - resourceDefinition = createObject(getFullyQualifiedType(descriptor), putSchema, resourceProperties); + resourceDefinition = createObject( + getFullyQualifiedType(descriptor), + putSchema, + resourceProperties + ); } else { - logInfo(`Resource type ${fullyQualifiedType} under path '${putRequest.path}' has no body defined.`); - resourceDefinition = factory.addObjectType(getFullyQualifiedType(descriptor), resourceProperties); - } - - for (const { propertyName, putProperty, getProperty } of getObjectTypeProperties(putSchema, getSchema, true)) { + logInfo( + `Resource type ${fullyQualifiedType} under path '${putRequest.path}' has no body defined.` + ); + resourceDefinition = factory.addObjectType( + getFullyQualifiedType(descriptor), + resourceProperties + ); + } + + for (const { + propertyName, + putProperty, + getProperty + } of getObjectTypeProperties(putSchema, getSchema, true)) { if (resourceProperties[propertyName]) { continue; } - const propertyDefinition = parseType(putProperty?.schema, getProperty?.schema); + const propertyDefinition = parseType( + putProperty?.schema, + getProperty?.schema + ); if (propertyDefinition) { - const description = (putProperty?.schema ?? getProperty?.schema)?.language.default?.description; - const flags = parsePropertyFlags(putProperty, getProperty, propertyName); - resourceProperties[propertyName] = createObjectProperty(propertyDefinition, flags, description); + const description = (putProperty?.schema ?? getProperty?.schema) + ?.language.default?.description; + const flags = parsePropertyFlags( + putProperty, + getProperty, + propertyName + ); + resourceProperties[propertyName] = createObjectProperty( + propertyDefinition, + flags, + description + ); } } if (putSchema?.discriminator || getSchema?.discriminator) { - const discriminatedObjectType = factory.lookupType(resourceDefinition) as DiscriminatedObjectType; + const discriminatedObjectType = factory.lookupType( + resourceDefinition + ) as DiscriminatedObjectType; handlePolymorphicType(discriminatedObjectType, putSchema, getSchema); } @@ -82,30 +155,40 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD return resourceDefinition; } - function processResource(fullyQualifiedType: string, definitions: ResourceDefinition[]) { + function processResource( + fullyQualifiedType: string, + definitions: ResourceDefinition[] + ) { if (definitions.length > 1) { for (const definition of definitions) { if (!definition.descriptor.constantName) { - logWarning(`Skipping resource type ${fullyQualifiedType} under path '${definitions[0].putRequest.path}': Found multiple definitions for the same type`); + logWarning( + `Skipping resource type ${fullyQualifiedType} under path '${definitions[0].putRequest.path}': Found multiple definitions for the same type` + ); return null; } } - + const polymorphicBodies: Dictionary = {}; for (const definition of definitions) { const bodyType = processResourceBody(fullyQualifiedType, definition); if (!bodyType || !definition.descriptor.constantName) { return null; } - + polymorphicBodies[definition.descriptor.constantName] = bodyType; } - const discriminatedBodyType = factory.addDiscriminatedObjectType(fullyQualifiedType, 'name', {}, polymorphicBodies); + const discriminatedBodyType = factory.addDiscriminatedObjectType( + fullyQualifiedType, + "name", + {}, + polymorphicBodies + ); const descriptor = { ...definitions[0].descriptor, - constantName: undefined, + constantName: undefined }; return { @@ -121,13 +204,14 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD return { descriptor: definition.descriptor, - bodyType: bodyType, + bodyType: bodyType }; } } function generateTypes() { - const { resourcesByType, resourceFunctions: resourceFunctionType } = definition; + const { resourcesByType, resourceFunctions: resourceFunctionType } = + definition; for (const fullyQualifiedType in resourcesByType) { const definitions = resourcesByType[fullyQualifiedType]; @@ -139,7 +223,7 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD const { descriptor, bodyType } = output; let resourceTypeFunctions: Record = {}; - + let actions = resourceFunctionType[fullyQualifiedType]; for (const key in actions) { let action = actions[key]; @@ -152,72 +236,129 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD } if (!action.responseSchema) { - logWarning(`Skipping resource action ${action.actionName} under path '${action.postRequest.path}': failed to find a response schema`); + logWarning( + `Skipping resource action ${action.actionName} under path '${action.postRequest.path}': failed to find a response schema` + ); continue; } - + const response = parseType(undefined, action.responseSchema); if (!response) { continue; } - let reference : TypeReference + let reference: TypeReference; if (request === undefined) { - reference = factory.addFunctionType([], response); - } - else { + reference = factory.addFunctionType([], response); + } else { // Only add properties if they exist on the request const reqObj = factory.lookupType(request) as ObjectType; - let parameters : FunctionParameter[] = []; + let parameters: FunctionParameter[] = []; if (reqObj && reqObj.properties) { Object.entries(reqObj.properties).forEach(([key, value]) => { - parameters.push({name: key, type: value.type, description: value.description} as FunctionParameter) - }) + parameters.push({ + name: key, + type: value.type, + description: value.description + } as FunctionParameter); + }); } - reference = factory.addFunctionType(parameters, response) + reference = factory.addFunctionType(parameters, response); } - resourceTypeFunctions[action.actionName] = {type: reference, description: action.actionName}; + resourceTypeFunctions[action.actionName] = { + type: reference, + description: action.actionName + }; } - factory.addResourceType(`${getFullyQualifiedType(descriptor)}@${descriptor.apiVersion}`, descriptor.scopeType, undefined, bodyType, ResourceFlags.None, resourceTypeFunctions); + factory.addResourceType( + `${getFullyQualifiedType(descriptor)}@${descriptor.apiVersion}`, + descriptor.scopeType, + undefined, + bodyType, + ResourceFlags.None, + resourceTypeFunctions + ); } return factory.types; } - function getStandardizedResourceProperties(descriptor: ResourceDescriptor, resourceName: TypeReference): Dictionary { - const type = factory.addStringLiteralType(getFullyQualifiedType(descriptor)); + function getStandardizedResourceProperties( + descriptor: ResourceDescriptor, + resourceName: TypeReference + ): Dictionary { + const type = factory.addStringLiteralType( + getFullyQualifiedType(descriptor) + ); return { - id: createObjectProperty(factory.addStringType(), ObjectTypePropertyFlags.ReadOnly | ObjectTypePropertyFlags.DeployTimeConstant, 'The resource id'), - name: createObjectProperty(resourceName, ObjectTypePropertyFlags.Required | ObjectTypePropertyFlags.DeployTimeConstant | ObjectTypePropertyFlags.Identifier, 'The resource name'), - type: createObjectProperty(type, ObjectTypePropertyFlags.ReadOnly | ObjectTypePropertyFlags.DeployTimeConstant, 'The resource type'), - apiVersion: createObjectProperty(factory.addStringLiteralType(descriptor.apiVersion), ObjectTypePropertyFlags.ReadOnly | ObjectTypePropertyFlags.DeployTimeConstant, 'The resource api version'), + id: createObjectProperty( + factory.addStringType(), + ObjectTypePropertyFlags.ReadOnly | + ObjectTypePropertyFlags.DeployTimeConstant, + "The resource id" + ), + name: createObjectProperty( + resourceName, + ObjectTypePropertyFlags.Required | + ObjectTypePropertyFlags.DeployTimeConstant | + ObjectTypePropertyFlags.Identifier, + "The resource name" + ), + type: createObjectProperty( + type, + ObjectTypePropertyFlags.ReadOnly | + ObjectTypePropertyFlags.DeployTimeConstant, + "The resource type" + ), + apiVersion: createObjectProperty( + factory.addStringLiteralType(descriptor.apiVersion), + ObjectTypePropertyFlags.ReadOnly | + ObjectTypePropertyFlags.DeployTimeConstant, + "The resource api version" + ) }; } - function createObject(definitionName: string, schema: ObjectSchema, properties: Dictionary, additionalProperties?: TypeReference) { + function createObject( + definitionName: string, + schema: ObjectSchema, + properties: Dictionary, + additionalProperties?: TypeReference + ) { if (schema.discriminator) { return factory.addDiscriminatedObjectType( definitionName, schema.discriminator.property.serializedName, properties, - {}); + {} + ); } - return factory.addObjectType(definitionName, properties, additionalProperties); + return factory.addObjectType( + definitionName, + properties, + additionalProperties + ); } - function combineAndThrowIfNull(putSchema: TSchema | undefined, getSchema: TSchema | undefined) { + function combineAndThrowIfNull( + putSchema: TSchema | undefined, + getSchema: TSchema | undefined + ) { const output = putSchema ?? getSchema; if (!output) { - throw 'Unable to find PUT or GET type'; + throw "Unable to find PUT or GET type"; } return output; } - function getSchemaProperties(schema: ObjectSchema, includeBaseProperties: boolean): Dictionary { + function getSchemaProperties( + schema: ObjectSchema, + includeBaseProperties: boolean + ): Dictionary { const objects = [schema]; if (includeBaseProperties) { for (const parent of schema.parents?.all || []) { @@ -227,21 +368,39 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD } } - return keyBy(flatMap(objects, o => o.properties || []), p => p.serializedName); + return keyBy( + flatMap(objects, (o) => o.properties || []), + (p) => p.serializedName + ); } - function* getObjectTypeProperties(putSchema: ObjectSchema | undefined, getSchema: ObjectSchema | undefined, includeBaseProperties: boolean) { - const putProperties = putSchema ? getSchemaProperties(putSchema, includeBaseProperties) : {}; - const getProperties = getSchema ? getSchemaProperties(getSchema, includeBaseProperties) : {}; - - for (const propertyName of uniq([...keys(putProperties), ...keys(getProperties)])) { - if ((putSchema?.discriminator?.property && putSchema.discriminator.property === putProperties[propertyName]) || - (getSchema?.discriminator?.property && getSchema.discriminator.property === getProperties[propertyName])) { + function* getObjectTypeProperties( + putSchema: ObjectSchema | undefined, + getSchema: ObjectSchema | undefined, + includeBaseProperties: boolean + ) { + const putProperties = putSchema + ? getSchemaProperties(putSchema, includeBaseProperties) + : {}; + const getProperties = getSchema + ? getSchemaProperties(getSchema, includeBaseProperties) + : {}; + + for (const propertyName of uniq([ + ...keys(putProperties), + ...keys(getProperties) + ])) { + if ( + (putSchema?.discriminator?.property && + putSchema.discriminator.property === putProperties[propertyName]) || + (getSchema?.discriminator?.property && + getSchema.discriminator.property === getProperties[propertyName]) + ) { continue; } - const putProperty = putProperties[propertyName] as Property | undefined - const getProperty = getProperties[propertyName] as Property | undefined + const putProperty = putProperties[propertyName] as Property | undefined; + const getProperty = getProperties[propertyName] as Property | undefined; yield { propertyName, putProperty, getProperty }; } @@ -265,7 +424,10 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD continue; } - if (schema.discriminator.property.serializedName !== value.discriminator.property.serializedName) { + if ( + schema.discriminator.property.serializedName !== + value.discriminator.property.serializedName + ) { throw `Unable to flatten discriminated properties - schemas '${getSerializedName(schema)}' and '${getSerializedName(value)}' have conflicting discriminators '${schema.discriminator.property.serializedName}' and '${value.discriminator.property.serializedName}'`; } @@ -278,44 +440,69 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD return output; } - function* getDiscriminatedSubTypes(putSchema: ObjectSchema | undefined, getSchema: ObjectSchema | undefined) { + function* getDiscriminatedSubTypes( + putSchema: ObjectSchema | undefined, + getSchema: ObjectSchema | undefined + ) { const putSubTypes = flattenDiscriminatorSubTypes(putSchema); const getSubTypes = flattenDiscriminatorSubTypes(getSchema); - for (const subTypeName of uniq([...keys(putSubTypes), ...keys(getSubTypes)])) { - yield { + for (const subTypeName of uniq([ + ...keys(putSubTypes), + ...keys(getSubTypes) + ])) { + yield { subTypeName, putSubType: putSubTypes[subTypeName], - getSubType: getSubTypes[subTypeName], + getSubType: getSubTypes[subTypeName] }; } } - function parseType(putSchema: Schema | undefined, getSchema: Schema | undefined): TypeReference | undefined { + function parseType( + putSchema: Schema | undefined, + getSchema: Schema | undefined + ): TypeReference | undefined { const combinedSchema = combineAndThrowIfNull(putSchema, getSchema); // A schema that matches a JSON object with specific properties, such as // { "name": { "type": "string" }, "age": { "type": "number" } } if (combinedSchema instanceof ObjectSchema) { - return parseObjectType(putSchema as ObjectSchema, getSchema as ObjectSchema, true); + return parseObjectType( + putSchema as ObjectSchema, + getSchema as ObjectSchema, + true + ); } // A schema that matches a "dictionary" JSON object, such as // { "additionalProperties": { "type": "string" } } if (combinedSchema instanceof DictionarySchema) { - return parseDictionaryType(putSchema as DictionarySchema, getSchema as DictionarySchema); + return parseDictionaryType( + putSchema as DictionarySchema, + getSchema as DictionarySchema + ); } // A schema that matches a single value from a given set of values, such as // { "enum": [ "a", "b" ] } if (combinedSchema instanceof ChoiceSchema) { - return parseEnumType(putSchema as ChoiceSchema, getSchema as ChoiceSchema); + return parseEnumType( + putSchema as ChoiceSchema, + getSchema as ChoiceSchema + ); } if (combinedSchema instanceof SealedChoiceSchema) { - return parseEnumType(putSchema as SealedChoiceSchema, getSchema as SealedChoiceSchema); + return parseEnumType( + putSchema as SealedChoiceSchema, + getSchema as SealedChoiceSchema + ); } if (combinedSchema instanceof ConstantSchema) { - return parseConstant(putSchema as ConstantSchema, getSchema as ConstantSchema); + return parseConstant( + putSchema as ConstantSchema, + getSchema as ConstantSchema + ); } // A schema that matches an array of values, such as @@ -326,7 +513,10 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD // A schema that matches simple values, such as { "type": "number" } if (combinedSchema instanceof PrimitiveSchema) { - return parsePrimaryType(putSchema as PrimitiveSchema, getSchema as PrimitiveSchema); + return parsePrimaryType( + putSchema as PrimitiveSchema, + getSchema as PrimitiveSchema + ); } // The 'any' type @@ -334,7 +524,9 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD return factory.addAnyType(); } - logWarning(`Unrecognized property type: ${combinedSchema.type}. Returning 'any'.`); + logWarning( + `Unrecognized property type: ${combinedSchema.type}. Returning 'any'.` + ); return factory.addAnyType(); } @@ -344,8 +536,9 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD return ObjectTypePropertyFlags.None; } - const writable = mutability.includes('create') || mutability.includes('update'); - const readable = mutability.includes('read'); + const writable = + mutability.includes("create") || mutability.includes("update"); + const readable = mutability.includes("read"); if (writable && !readable) { return ObjectTypePropertyFlags.WriteOnly; @@ -358,15 +551,19 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD return ObjectTypePropertyFlags.None; } - function parsePropertyFlags(putProperty: Property | undefined, getProperty: Property | undefined, propertyName?: string) { + function parsePropertyFlags( + putProperty: Property | undefined, + getProperty: Property | undefined, + propertyName?: string + ) { let flags = ObjectTypePropertyFlags.None; if (putProperty && putProperty.required) { // 'location' is not a required property on resources but can be a required property on other nested types // We need to update the property flag to not be required if we're processing a top-level 'location' property // If propertyName is provided, then we are processing a top-level property and need to check if the property name is 'location' - // If propertyName is not provided, then we are not processing a top-level property and can proceed with no changes - if (!propertyName || propertyName !== 'location') { + // If propertyName is not provided, then we are not processing a top-level property and can proceed with no changes + if (!propertyName || propertyName !== "location") { flags |= ObjectTypePropertyFlags.Required; } } @@ -386,7 +583,10 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD return flags; } - function parsePrimaryType(putSchema: PrimitiveSchema | undefined, getSchema: PrimitiveSchema | undefined) { + function parsePrimaryType( + putSchema: PrimitiveSchema | undefined, + getSchema: PrimitiveSchema | undefined + ) { const combinedSchema = combineAndThrowIfNull(putSchema, getSchema); switch (combinedSchema.type) { @@ -399,7 +599,7 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD case SchemaType.Object: return factory.addAnyType(); case SchemaType.ByteArray: - return factory.addArrayType(factory.addAnyType()); + return factory.addArrayType(factory.addAnyType()); case SchemaType.Uri: case SchemaType.Date: case SchemaType.DateTime: @@ -410,13 +610,22 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD case SchemaType.Credential: return factory.addStringType(); default: - logWarning(`Unrecognized known property type: "${combinedSchema.type}"`); + logWarning( + `Unrecognized known property type: "${combinedSchema.type}"` + ); return factory.addAnyType(); } } - function handlePolymorphicType(discriminatedObjectType: DiscriminatedObjectType, putSchema?: ObjectSchema, getSchema?: ObjectSchema) { - for (const { putSubType, getSubType } of getDiscriminatedSubTypes(putSchema, getSchema)) { + function handlePolymorphicType( + discriminatedObjectType: DiscriminatedObjectType, + putSchema?: ObjectSchema, + getSchema?: ObjectSchema + ) { + for (const { putSubType, getSubType } of getDiscriminatedSubTypes( + putSchema, + getSchema + )) { const combinedSubType = combineAndThrowIfNull(putSubType, getSubType); if (!combinedSubType.discriminatorValue) { @@ -426,21 +635,31 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD const objectTypeRef = parseObjectType(putSubType, getSubType, false); const objectType = factory.lookupType(objectTypeRef); if (objectType.type !== TypeBaseKind.ObjectType) { - logWarning(`Found unexpected element of discriminated type '${discriminatedObjectType.name}'`) + logWarning( + `Found unexpected element of discriminated type '${discriminatedObjectType.name}'` + ); continue; } - discriminatedObjectType.elements[combinedSubType.discriminatorValue] = objectTypeRef; + discriminatedObjectType.elements[combinedSubType.discriminatorValue] = + objectTypeRef; - const description = (putSchema ?? getSchema)?.discriminator?.property.language.default.description; - objectType.properties[discriminatedObjectType.discriminator] = createObjectProperty( - factory.addStringLiteralType(combinedSubType.discriminatorValue), - ObjectTypePropertyFlags.Required, - description); + const description = (putSchema ?? getSchema)?.discriminator?.property + .language.default.description; + objectType.properties[discriminatedObjectType.discriminator] = + createObjectProperty( + factory.addStringLiteralType(combinedSubType.discriminatorValue), + ObjectTypePropertyFlags.Required, + description + ); } } - function parseObjectType(putSchema: ObjectSchema | undefined, getSchema: ObjectSchema | undefined, includeBaseProperties: boolean) { + function parseObjectType( + putSchema: ObjectSchema | undefined, + getSchema: ObjectSchema | undefined, + includeBaseProperties: boolean + ) { const combinedSchema = combineAndThrowIfNull(putSchema, getSchema); const definitionName = getSerializedName(combinedSchema); @@ -449,35 +668,61 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD // so construct the type on-the-fly, and don't cache it globally return namedDefinitions[definitionName]; } - + let additionalProperties: TypeReference | undefined; if (includeBaseProperties) { - const putParentDictionary = (putSchema?.parents?.all || []).filter(x => x instanceof DictionarySchema).map(x => x as DictionarySchema)[0]; - const getParentDictionary = (getSchema?.parents?.all || []).filter(x => x instanceof DictionarySchema).map(x => x as DictionarySchema)[0]; + const putParentDictionary = (putSchema?.parents?.all || []) + .filter((x) => x instanceof DictionarySchema) + .map((x) => x as DictionarySchema)[0]; + const getParentDictionary = (getSchema?.parents?.all || []) + .filter((x) => x instanceof DictionarySchema) + .map((x) => x as DictionarySchema)[0]; if (putParentDictionary || getParentDictionary) { - additionalProperties = parseType(putParentDictionary?.elementType, getParentDictionary?.elementType); + additionalProperties = parseType( + putParentDictionary?.elementType, + getParentDictionary?.elementType + ); } } const definitionProperties: Dictionary = {}; - const definition = createObject(definitionName, combinedSchema, definitionProperties, additionalProperties); + const definition = createObject( + definitionName, + combinedSchema, + definitionProperties, + additionalProperties + ); if (includeBaseProperties) { // cache the definition so that it can be re-used namedDefinitions[definitionName] = definition; } - for (const { propertyName, putProperty, getProperty } of getObjectTypeProperties(putSchema, getSchema, includeBaseProperties)) { - const propertyDefinition = parseType(putProperty?.schema, getProperty?.schema); + for (const { + propertyName, + putProperty, + getProperty + } of getObjectTypeProperties(putSchema, getSchema, includeBaseProperties)) { + const propertyDefinition = parseType( + putProperty?.schema, + getProperty?.schema + ); if (propertyDefinition) { - const description = (putProperty?.schema ?? getProperty?.schema)?.language.default?.description; + const description = (putProperty?.schema ?? getProperty?.schema) + ?.language.default?.description; const flags = parsePropertyFlags(putProperty, getProperty); - definitionProperties[propertyName] = createObjectProperty(propertyDefinition, flags, description); + definitionProperties[propertyName] = createObjectProperty( + propertyDefinition, + flags, + description + ); } } if (combinedSchema.discriminator) { - const discriminatedObjectType = factory.lookupType(definition) as DiscriminatedObjectType; + const discriminatedObjectType = factory.lookupType( + definition + ) as DiscriminatedObjectType; handlePolymorphicType(discriminatedObjectType, putSchema, getSchema); } @@ -485,7 +730,10 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD return definition; } - function parseEnumType(putSchema: ChoiceSchema | SealedChoiceSchema | undefined, getSchema: ChoiceSchema | SealedChoiceSchema | undefined) { + function parseEnumType( + putSchema: ChoiceSchema | SealedChoiceSchema | undefined, + getSchema: ChoiceSchema | SealedChoiceSchema | undefined + ) { const combinedSchema = combineAndThrowIfNull(putSchema, getSchema); if (!(combinedSchema.choiceType instanceof StringSchema)) { @@ -495,7 +743,9 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD const enumTypes = []; for (const enumValue of combinedSchema.choices) { - const stringLiteralType = factory.addStringLiteralType(enumValue.value.toString()); + const stringLiteralType = factory.addStringLiteralType( + enumValue.value.toString() + ); enumTypes.push(stringLiteralType); } @@ -506,21 +756,37 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD return factory.addUnionType(enumTypes); } - function parseConstant(putSchema: ConstantSchema | undefined, getSchema: ConstantSchema | undefined) { + function parseConstant( + putSchema: ConstantSchema | undefined, + getSchema: ConstantSchema | undefined + ) { const combinedSchema = combineAndThrowIfNull(putSchema, getSchema); const constantValue = combinedSchema.value; return factory.addStringLiteralType(constantValue.value.toString()); } - function parseDictionaryType(putSchema: DictionarySchema | undefined, getSchema: DictionarySchema | undefined) { + function parseDictionaryType( + putSchema: DictionarySchema | undefined, + getSchema: DictionarySchema | undefined + ) { const combinedSchema = combineAndThrowIfNull(putSchema, getSchema); - const additionalPropertiesType = parseType(putSchema?.elementType, getSchema?.elementType); - - return factory.addObjectType(getSerializedName(combinedSchema), {}, additionalPropertiesType); + const additionalPropertiesType = parseType( + putSchema?.elementType, + getSchema?.elementType + ); + + return factory.addObjectType( + getSerializedName(combinedSchema), + {}, + additionalPropertiesType + ); } - function parseArrayType(putSchema: ArraySchema | undefined, getSchema: ArraySchema | undefined) { + function parseArrayType( + putSchema: ArraySchema | undefined, + getSchema: ArraySchema | undefined + ) { const itemType = parseType(putSchema?.elementType, getSchema?.elementType); if (!itemType) { return factory.addArrayType(factory.addAnyType()); @@ -529,9 +795,17 @@ export function generateTypes(host: AutorestExtensionHost, definition: ProviderD return factory.addArrayType(itemType); } - function createObjectProperty(type: TypeReference, flags: ObjectTypePropertyFlags, description?: string): ObjectTypeProperty { - return {type: type, flags: flags, description: description?.trim() || undefined}; + function createObjectProperty( + type: TypeReference, + flags: ObjectTypePropertyFlags, + description?: string + ): ObjectTypeProperty { + return { + type: type, + flags: flags, + description: description?.trim() || undefined + }; } return generateTypes(); -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/autorest.bicep/src/utils.ts b/hack/bicep-types-radius/src/autorest.bicep/src/utils.ts index b9830f2cad1..46955caa3d8 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/src/utils.ts +++ b/hack/bicep-types-radius/src/autorest.bicep/src/utils.ts @@ -14,21 +14,21 @@ // limitations under the License. // ------------------------------------------------------------. export interface SuccessResult { - success: true, - value: V, + success: true; + value: V; } export interface FailureResult { - success: false, - error: E, + success: false; + error: E; } -export type Result = SuccessResult | FailureResult +export type Result = SuccessResult | FailureResult; export function success(value: V): SuccessResult { - return { success: true, value, }; + return { success: true, value }; } export function failure(error: E): FailureResult { - return { success: false, error, }; -} \ No newline at end of file + return { success: false, error }; +} diff --git a/hack/bicep-types-radius/src/autorest.bicep/src/writers/markdown-table.ts b/hack/bicep-types-radius/src/autorest.bicep/src/writers/markdown-table.ts index cffbe66c6a4..32d7254e04a 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/src/writers/markdown-table.ts +++ b/hack/bicep-types-radius/src/autorest.bicep/src/writers/markdown-table.ts @@ -13,21 +13,48 @@ // See the License for the specific language governing permissions and // limitations under the License. // ------------------------------------------------------------. -import { Dictionary, filter, keys, orderBy } from 'lodash'; -import { ArrayType, BuiltInType, DiscriminatedObjectType, getBuiltInTypeKindLabel, getObjectTypePropertyFlagsLabels, ObjectTypeProperty, ObjectType, ResourceFunctionType, ResourceType, StringLiteralType, BicepType, TypeBaseKind, TypeReference, UnionType, IntegerType, StringType } from 'bicep-types'; - -export function writeTableMarkdown(provider: string, apiVersion: string, resourceTypes: ResourceType[], types: BicepType[]) { - let output = ''; - - function getTypeName(types: BicepType[], typeReference: TypeReference): string { +import { Dictionary, filter, keys, orderBy } from "lodash"; +import { + ArrayType, + BuiltInType, + DiscriminatedObjectType, + getBuiltInTypeKindLabel, + getObjectTypePropertyFlagsLabels, + ObjectTypeProperty, + ObjectType, + ResourceFunctionType, + ResourceType, + StringLiteralType, + BicepType, + TypeBaseKind, + TypeReference, + UnionType, + IntegerType, + StringType +} from "bicep-types"; + +export function writeTableMarkdown( + provider: string, + apiVersion: string, + resourceTypes: ResourceType[], + types: BicepType[] +) { + let output = ""; + + function getTypeName( + types: BicepType[], + typeReference: TypeReference + ): string { const type = types[typeReference.index]; switch (type.type) { case TypeBaseKind.BuiltInType: - return getBuiltInTypeKindLabel((type as BuiltInType).kind).toLowerCase(); + return getBuiltInTypeKindLabel( + (type as BuiltInType).kind + ).toLowerCase(); case TypeBaseKind.ObjectType: return generateAnchorLink((type as ObjectType).name); case TypeBaseKind.ArrayType: - return getArrayTypeName(types, (type as ArrayType)); + return getArrayTypeName(types, type as ArrayType); case TypeBaseKind.ResourceType: return (type as ResourceType).name; case TypeBaseKind.ResourceFunctionType: { @@ -35,19 +62,21 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc return `${functionType.name} (${functionType.resourceType}@${functionType.apiVersion})`; } case TypeBaseKind.UnionType: { - const elements = (type as UnionType).elements.map(x => getTypeName(types, x)); - return elements.sort().join(' | '); + const elements = (type as UnionType).elements.map((x) => + getTypeName(types, x) + ); + return elements.sort().join(" | "); } case TypeBaseKind.StringLiteralType: return `'${(type as StringLiteralType).value}'`; case TypeBaseKind.DiscriminatedObjectType: return generateAnchorLink((type as DiscriminatedObjectType).name); case TypeBaseKind.AnyType: - return 'any'; + return "any"; case TypeBaseKind.NullType: - return 'null'; + return "null"; case TypeBaseKind.BooleanType: - return 'bool'; + return "bool"; case TypeBaseKind.IntegerType: return `int${getIntegerModifiers(type as IntegerType)}`; case TypeBaseKind.StringType: @@ -57,11 +86,9 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc } } - function getArrayTypeName(types: BicepType[], type: ArrayType): string - { + function getArrayTypeName(types: BicepType[], type: ArrayType): string { let itemTypeName = getTypeName(types, type.itemType); - if (itemTypeName.indexOf(' ') != -1) - { + if (itemTypeName.indexOf(" ") != -1) { itemTypeName = `(${itemTypeName})`; } @@ -69,27 +96,43 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc } function generateAnchorLink(name: string) { - return `[${name}](#${name.replace(/[^a-zA-Z0-9-]/g, '').toLowerCase()})`; + return `[${name}](#${name.replace(/[^a-zA-Z0-9-]/g, "").toLowerCase()})`; } - function writeTypeProperty(types: BicepType[], name: string, property: ObjectTypeProperty) { - const flagsString = property.flags ? `${getObjectTypePropertyFlagsLabels(property.flags).join(', ')}` : ''; - const descriptionString = property.description ? property.description : ''; - writeTableEntry(name, getTypeName(types, property.type), flagsString, descriptionString); + function writeTypeProperty( + types: BicepType[], + name: string, + property: ObjectTypeProperty + ) { + const flagsString = property.flags + ? `${getObjectTypePropertyFlagsLabels(property.flags).join(", ")}` + : ""; + const descriptionString = property.description ? property.description : ""; + writeTableEntry( + name, + getTypeName(types, property.type), + flagsString, + descriptionString + ); } - function writeTableHeading(){ + function writeTableHeading() { output += `| Property | Type | Description |\n`; output += `|----------|------|-------------|\n`; } - function writeTableEntry(name: string, type: string, flags: string, description: string){ - const flagString = flags ? `
_(${flags})_ ` : ''; + function writeTableEntry( + name: string, + type: string, + flags: string, + description: string + ) { + const flagString = flags ? `
_(${flags})_ ` : ""; output += `| **${name}** | ${type} | ${description} ${flagString}|\n`; } function writeHeading(nesting: number, message: string) { - output += `${'#'.repeat(nesting)} ${message}`; + output += `${"#".repeat(nesting)} ${message}`; writeNewLine(); } @@ -102,11 +145,18 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc } function writeNewLine() { - output += '\n'; + output += "\n"; } - function findTypesToWrite(types: BicepType[], typesToWrite: BicepType[], typeReference: TypeReference) { - function processTypeLinks(typeReference: TypeReference, skipParent: boolean) { + function findTypesToWrite( + types: BicepType[], + typesToWrite: BicepType[], + typeReference: TypeReference + ) { + function processTypeLinks( + typeReference: TypeReference, + skipParent: boolean + ) { // this is needed to avoid circular type references causing stack overflows if (typesToWrite.indexOf(types[typeReference.index]) === -1) { if (!skipParent) { @@ -142,7 +192,10 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc const discriminatedObjectType = type as DiscriminatedObjectType; for (const key of sortedKeys(discriminatedObjectType.baseProperties)) { - processTypeLinks(discriminatedObjectType.baseProperties[key].type, false); + processTypeLinks( + discriminatedObjectType.baseProperties[key].type, + false + ); } for (const key of sortedKeys(discriminatedObjectType.elements)) { @@ -157,10 +210,15 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc } function sortedKeys(dictionary: Dictionary) { - return orderBy(keys(dictionary), k => k.toLowerCase(), 'asc'); + return orderBy(keys(dictionary), (k) => k.toLowerCase(), "asc"); } - function writeComplexType(types: BicepType[], type: BicepType, nesting: number, includeHeader: boolean) { + function writeComplexType( + types: BicepType[], + type: BicepType, + nesting: number, + includeHeader: boolean + ) { switch (type.type) { case TypeBaseKind.ResourceType: { const resourceType = type as ResourceType; @@ -173,7 +231,10 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc } case TypeBaseKind.ResourceFunctionType: { const resourceFunctionType = type as ResourceFunctionType; - writeHeading(nesting, `Function ${resourceFunctionType.name} (${resourceFunctionType.resourceType}@${resourceFunctionType.apiVersion})`); + writeHeading( + nesting, + `Function ${resourceFunctionType.name} (${resourceFunctionType.resourceType}@${resourceFunctionType.apiVersion})` + ); writeNewLine(); writeBullet("Resource", resourceFunctionType.resourceType); writeBullet("ApiVersion", resourceFunctionType.apiVersion); @@ -198,8 +259,7 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc if (Object.keys(objectType.properties).length === 0) { writeBullet("none", ""); writeNewLine(); - } - else { + } else { writeTableHeading(); for (const key of sortedKeys(objectType.properties)) { writeTypeProperty(types, key, objectType.properties[key]); @@ -209,7 +269,10 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc if (objectType.additionalProperties) { writeHeading(nesting + 1, "Additional Properties"); writeNewLine(); - writeBullet("Additional Properties Type", getTypeName(types, objectType.additionalProperties)); + writeBullet( + "Additional Properties Type", + getTypeName(types, objectType.additionalProperties) + ); } writeNewLine(); @@ -230,16 +293,21 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc if (Object.keys(discriminatedObjectType.baseProperties).length === 0) { writeBullet("none", ""); writeNewLine(); - } - else { + } else { writeTableHeading(); - for (const propertyName of sortedKeys(discriminatedObjectType.baseProperties)) { - writeTypeProperty(types, propertyName, discriminatedObjectType.baseProperties[propertyName]); + for (const propertyName of sortedKeys( + discriminatedObjectType.baseProperties + )) { + writeTypeProperty( + types, + propertyName, + discriminatedObjectType.baseProperties[propertyName] + ); } } writeNewLine(); - + for (const key of sortedKeys(discriminatedObjectType.elements)) { const element = discriminatedObjectType.elements[key]; writeComplexType(types, types[element.index], nesting + 1, true); @@ -251,11 +319,27 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc } } - function generateMarkdown(provider: string, apiVersion: string, types: BicepType[]) { - - const resourceFunctionTypes = orderBy(types.filter(t => t.type == TypeBaseKind.ResourceFunctionType) as ResourceFunctionType[], x => x.name.split('@')[0].toLowerCase()); - const filteredFunctionTypes = resourceFunctionTypes.filter(x => resourceTypes.some(y => x.resourceType.toLowerCase() === y.name.split('@')[0].toLowerCase())); - const typesToWrite: BicepType[] = [...resourceTypes, ...filteredFunctionTypes]; + function generateMarkdown( + provider: string, + apiVersion: string, + types: BicepType[] + ) { + const resourceFunctionTypes = orderBy( + types.filter( + (t) => t.type == TypeBaseKind.ResourceFunctionType + ) as ResourceFunctionType[], + (x) => x.name.split("@")[0].toLowerCase() + ); + const filteredFunctionTypes = resourceFunctionTypes.filter((x) => + resourceTypes.some( + (y) => + x.resourceType.toLowerCase() === y.name.split("@")[0].toLowerCase() + ) + ); + const typesToWrite: BicepType[] = [ + ...resourceTypes, + ...filteredFunctionTypes + ]; for (const resourceType of resourceTypes) { findTypesToWrite(types, typesToWrite, resourceType.body); @@ -280,22 +364,25 @@ export function writeTableMarkdown(provider: string, apiVersion: string, resourc return generateMarkdown(provider, apiVersion, types); } -function getIntegerModifiers(type: IntegerType): string -{ - return formatModifiers(type.minValue !== undefined ? `minValue: ${type.minValue}` : undefined, - type.maxValue !== undefined ? `maxValue: ${type.maxValue}` : undefined); +function getIntegerModifiers(type: IntegerType): string { + return formatModifiers( + type.minValue !== undefined ? `minValue: ${type.minValue}` : undefined, + type.maxValue !== undefined ? `maxValue: ${type.maxValue}` : undefined + ); } -function getStringModifiers(type: StringType): string -{ - return formatModifiers(type.sensitive ? 'sensitive' : undefined, +function getStringModifiers(type: StringType): string { + return formatModifiers( + type.sensitive ? "sensitive" : undefined, type.minLength !== undefined ? `minLength: ${type.minLength}` : undefined, type.maxLength !== undefined ? `maxLength: ${type.maxLength}` : undefined, - type.pattern !== undefined ? `pattern: "${type.pattern.replace('"', '\\"')}"` : undefined); + type.pattern !== undefined + ? `pattern: "${type.pattern.replace('"', '\\"')}"` + : undefined + ); } -function formatModifiers(...modifiers: Array): string -{ - const modifierString = modifiers.filter(modifier => !!modifier).join(', '); +function formatModifiers(...modifiers: Array): string { + const modifierString = modifiers.filter((modifier) => !!modifier).join(", "); return modifierString.length > 0 ? ` {${modifierString}}` : modifierString; -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/autorest.bicep/test/integration/generated/basic/test.rp1/2021-10-31/types.json b/hack/bicep-types-radius/src/autorest.bicep/test/integration/generated/basic/test.rp1/2021-10-31/types.json index 9ce01f9846e..362adb02d82 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/test/integration/generated/basic/test.rp1/2021-10-31/types.json +++ b/hack/bicep-types-radius/src/autorest.bicep/test/integration/generated/basic/test.rp1/2021-10-31/types.json @@ -309,4 +309,4 @@ } } } -] \ No newline at end of file +] diff --git a/hack/bicep-types-radius/src/autorest.bicep/test/integration/integration.test.ts b/hack/bicep-types-radius/src/autorest.bicep/test/integration/integration.test.ts index 4c0b322c14f..29f7298e428 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/test/integration/integration.test.ts +++ b/hack/bicep-types-radius/src/autorest.bicep/test/integration/integration.test.ts @@ -13,52 +13,57 @@ // See the License for the specific language governing permissions and // limitations under the License. // ------------------------------------------------------------. -import os from 'os'; -import path from 'path'; -import { rm, mkdir } from 'fs/promises'; -import { compare } from 'dir-compare'; -import { defaultLogger, executeCmd, ILogger } from './utils'; +import os from "os"; +import path from "path"; +import { rm, mkdir } from "fs/promises"; +import { compare } from "dir-compare"; +import { defaultLogger, executeCmd, ILogger } from "./utils"; const extensionDir = path.resolve(`${__dirname}/../../`); -const autorestBinary = os.platform() === 'win32' ? 'autorest.cmd' : 'autorest'; +const autorestBinary = os.platform() === "win32" ? "autorest.cmd" : "autorest"; const outputBaseDir = `${__dirname}/generated`; -async function generateSchema(logger: ILogger, readme: string, outputBaseDir: string, verbose: boolean, waitForDebugger: boolean) { +async function generateSchema( + logger: ILogger, + readme: string, + outputBaseDir: string, + verbose: boolean, + waitForDebugger: boolean +) { let autoRestParams = [ `--use=@autorest/modelerfour`, `--use=${extensionDir}`, - '--bicep', + "--bicep", `--output-folder=${outputBaseDir}`, `--multiapi`, - '--title=none', + "--title=none", // This is necessary to avoid failures such as "ERROR: Semantic violation: Discriminator must be a required property." blocking type generation. // In an ideal world, we'd raise issues in https://github.com/Azure/azure-rest-api-specs and force RP teams to fix them, but this isn't very practical - // as new validations are added continuously, and there's often quite a lag before teams will fix them - we don't want to be blocked by this in generating types. + // as new validations are added continuously, and there's often quite a lag before teams will fix them - we don't want to be blocked by this in generating types. `--skip-semantics-validation`, - readme, + readme ]; if (verbose) { - autoRestParams = autoRestParams.concat([ - `--debug`, - `--verbose`, - ]); + autoRestParams = autoRestParams.concat([`--debug`, `--verbose`]); } if (waitForDebugger) { - autoRestParams = autoRestParams.concat([ - `--bicep.debugger`, - ]); + autoRestParams = autoRestParams.concat([`--bicep.debugger`]); } - return await executeCmd(logger, verbose, __dirname, autorestBinary, autoRestParams); + return await executeCmd( + logger, + verbose, + __dirname, + autorestBinary, + autoRestParams + ); } -describe('integration tests', () => { +describe("integration tests", () => { // add any new spec paths under ./specs to this list - const specs = [ - `basic`, - ] + const specs = [`basic`]; // set to true to overwrite baselines const record = false; @@ -68,19 +73,36 @@ describe('integration tests', () => { for (const spec of specs) { it(spec, async () => { - const readmePath = path.join(__dirname, `specs/${spec}/resource-manager/README.md`); + const readmePath = path.join( + __dirname, + `specs/${spec}/resource-manager/README.md` + ); const outputDir = `${outputBaseDir}/${spec}`; if (record) { - await rm(outputDir, { recursive: true, force: true, }); - await generateSchema(defaultLogger, readmePath, outputDir, false, false); + await rm(outputDir, { recursive: true, force: true }); + await generateSchema( + defaultLogger, + readmePath, + outputDir, + false, + false + ); } else { const stagingOutputDir = `${__dirname}/temp/${spec}`; - await rm(stagingOutputDir, { recursive: true, force: true, }); - - await generateSchema(defaultLogger, readmePath, stagingOutputDir, false, false); - - const compareResult = await compare(stagingOutputDir, outputDir, { compareContent: true }); + await rm(stagingOutputDir, { recursive: true, force: true }); + + await generateSchema( + defaultLogger, + readmePath, + stagingOutputDir, + false, + false + ); + + const compareResult = await compare(stagingOutputDir, outputDir, { + compareContent: true + }); // Assert that the generated files match the baseline files which have been checked in. // Set 'record' to true to run the tests in record mode and overwrite baselines. @@ -88,4 +110,4 @@ describe('integration tests', () => { } }); } -}); \ No newline at end of file +}); diff --git a/hack/bicep-types-radius/src/autorest.bicep/test/integration/specs/basic/resource-manager/Test.Rp1/stable/2021-10-31/spec.json b/hack/bicep-types-radius/src/autorest.bicep/test/integration/specs/basic/resource-manager/Test.Rp1/stable/2021-10-31/spec.json index bea5a33037e..9be000c53f7 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/test/integration/specs/basic/resource-manager/Test.Rp1/stable/2021-10-31/spec.json +++ b/hack/bicep-types-radius/src/autorest.bicep/test/integration/specs/basic/resource-manager/Test.Rp1/stable/2021-10-31/spec.json @@ -1,7 +1,5 @@ { - "schemes": [ - "https" - ], + "schemes": ["https"], "swagger": "2.0", "info": { "title": "Test.Rp1 spec", @@ -9,12 +7,8 @@ "version": "2021-10-31" }, "host": "management.azure.com", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], + "consumes": ["application/json"], + "produces": ["application/json"], "securityDefinitions": { "azure_auth": { "type": "oauth2", @@ -51,10 +45,7 @@ }, "stringEnum": { "type": "string", - "enum": [ - "Foo", - "Bar" - ], + "enum": ["Foo", "Bar"], "x-ms-enum": { "name": "StringEnum", "values": [ @@ -89,9 +80,7 @@ "description": "The foo request string" } }, - "required": [ - "someString" - ] + "required": ["someString"] }, "ArrayOfFoosResponse": { "type": "array", @@ -296,4 +285,4 @@ } } } -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/autorest.bicep/test/integration/specs/common-types/resource-management/v3/types.json b/hack/bicep-types-radius/src/autorest.bicep/test/integration/specs/common-types/resource-management/v3/types.json index 6611e1a5615..fae25ed0096 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/test/integration/specs/common-types/resource-management/v3/types.json +++ b/hack/bicep-types-radius/src/autorest.bicep/test/integration/specs/common-types/resource-management/v3/types.json @@ -63,25 +63,16 @@ "additionalProperties": { "type": "string" }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], + "x-ms-mutability": ["read", "create", "update"], "description": "Resource tags." }, "location": { "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], + "x-ms-mutability": ["read", "create"], "description": "The geo-location where the resource lives" } }, - "required": [ - "location" - ], + "required": ["location"], "allOf": [ { "$ref": "#/definitions/Resource" @@ -105,9 +96,7 @@ "id": { "readOnly": true, "type": "string", - "x-ms-mutability": [ - "read" - ], + "x-ms-mutability": ["read"], "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" }, "name": { @@ -118,34 +107,22 @@ "type": { "readOnly": true, "type": "string", - "x-ms-mutability": [ - "read" - ], + "x-ms-mutability": ["read"], "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" }, "location": { "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], + "x-ms-mutability": ["read", "create"], "description": "The geo-location where the resource lives" }, "managedBy": { "type": "string", - "x-ms-mutability": [ - "read", - "create", - "update" - ], + "x-ms-mutability": ["read", "create", "update"], "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource." }, "kind": { "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], + "x-ms-mutability": ["read", "create"], "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource provider must validate and persist this value.", "pattern": "^[-\\w\\._,\\(\\)]+$" }, @@ -159,11 +136,7 @@ "additionalProperties": { "type": "string" }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], + "x-ms-mutability": ["read", "create", "update"], "description": "Resource tags." }, "identity": { @@ -192,12 +165,7 @@ }, "SkuTier": { "type": "string", - "enum": [ - "Free", - "Basic", - "Standard", - "Premium" - ], + "enum": ["Free", "Basic", "Standard", "Premium"], "x-ms-enum": { "name": "SkuTier", "modelAsString": false @@ -229,9 +197,7 @@ "description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted." } }, - "required": [ - "name" - ] + "required": ["name"] }, "Identity": { "description": "Identity for the resource.", @@ -250,9 +216,7 @@ "type": { "type": "string", "description": "The identity type.", - "enum": [ - "SystemAssigned" - ], + "enum": ["SystemAssigned"], "x-ms-enum": { "name": "ResourceIdentityType", "modelAsString": false @@ -285,11 +249,7 @@ } }, "description": "Plan for the resource.", - "required": [ - "name", - "publisher", - "product" - ] + "required": ["name", "publisher", "product"] }, "ErrorDetail": { "description": "The error detail.", @@ -400,11 +360,7 @@ "description": "The intended executor of the operation; as in Resource Based Access Control (RBAC) and audit logs UX. Default value is \"user,system\"", "type": "string", "readOnly": true, - "enum": [ - "user", - "system", - "user,system" - ], + "enum": ["user", "system", "user,system"], "x-ms-enum": { "name": "Origin", "modelAsString": true @@ -414,9 +370,7 @@ "description": "Enum. Indicates the action type. \"Internal\" refers to actions that are for internal only APIs.", "type": "string", "readOnly": true, - "enum": [ - "Internal" - ], + "enum": ["Internal"], "x-ms-enum": { "name": "ActionType", "modelAsString": true @@ -446,9 +400,7 @@ "OperationStatusResult": { "description": "The current status of an async operation.", "type": "object", - "required": [ - "status" - ], + "required": ["status"], "properties": { "id": { "description": "Fully qualified ID for the async operation.", @@ -513,9 +465,7 @@ "description": "The country or region where the resource is located" } }, - "required": [ - "name" - ] + "required": ["name"] }, "systemData": { "description": "Metadata pertaining to creation and last modification of the resource.", @@ -529,12 +479,7 @@ "createdByType": { "type": "string", "description": "The type of identity that created the resource.", - "enum": [ - "User", - "Application", - "ManagedIdentity", - "Key" - ], + "enum": ["User", "Application", "ManagedIdentity", "Key"], "x-ms-enum": { "name": "createdByType", "modelAsString": true @@ -552,12 +497,7 @@ "lastModifiedByType": { "type": "string", "description": "The type of identity that last modified the resource.", - "enum": [ - "User", - "Application", - "ManagedIdentity", - "Key" - ], + "enum": ["User", "Application", "ManagedIdentity", "Key"], "x-ms-enum": { "name": "createdByType", "modelAsString": true @@ -576,10 +516,7 @@ "properties": { "status": { "description": "Indicates whether or not the encryption is enabled for container registry.", - "enum": [ - "enabled", - "disabled" - ], + "enum": ["enabled", "disabled"], "type": "string", "x-ms-enum": { "name": "EncryptionStatus", @@ -630,10 +567,7 @@ "reason": { "description": "The reason why the given name is not available.", "type": "string", - "enum": [ - "Invalid", - "AlreadyExists" - ], + "enum": ["Invalid", "AlreadyExists"], "x-ms-enum": { "name": "CheckNameAvailabilityReason", "modelAsString": true @@ -692,4 +626,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/autorest.bicep/test/integration/utils.ts b/hack/bicep-types-radius/src/autorest.bicep/test/integration/utils.ts index a292c659ee2..a51762ec20a 100644 --- a/hack/bicep-types-radius/src/autorest.bicep/test/integration/utils.ts +++ b/hack/bicep-types-radius/src/autorest.bicep/test/integration/utils.ts @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // ------------------------------------------------------------. -import path from 'path'; -import { createWriteStream } from 'fs'; -import { readdir, stat, mkdir, rm, copyFile } from 'fs/promises'; -import { spawn } from 'child_process'; -import colors from 'colors'; +import path from "path"; +import { createWriteStream } from "fs"; +import { readdir, stat, mkdir, rm, copyFile } from "fs/promises"; +import { spawn } from "child_process"; +import colors from "colors"; export interface ILogger { out: (data: string) => void; @@ -25,20 +25,29 @@ export interface ILogger { } export const defaultLogger: ILogger = { - out: data => process.stdout.write(data), - err: data => process.stderr.write(data), -} - -export async function copyRecursive(sourceBasePath: string, destinationBasePath: string): Promise { + out: (data) => process.stdout.write(data), + err: (data) => process.stderr.write(data) +}; + +export async function copyRecursive( + sourceBasePath: string, + destinationBasePath: string +): Promise { for (const filePath of await findRecursive(sourceBasePath, () => true)) { - const destinationPath = path.join(destinationBasePath, path.relative(sourceBasePath, filePath)); + const destinationPath = path.join( + destinationBasePath, + path.relative(sourceBasePath, filePath) + ); await mkdir(path.dirname(destinationPath), { recursive: true }); await copyFile(filePath, destinationPath); } } -export async function findRecursive(basePath: string, filter: (name: string) => boolean): Promise { +export async function findRecursive( + basePath: string, + filter: (name: string) => boolean +): Promise { let results: string[] = []; for (const subPathName of await readdir(basePath)) { @@ -65,31 +74,41 @@ export async function findRecursive(basePath: string, filter: (name: string) => return results; } -export function executeCmd(logger: ILogger, verbose: boolean, cwd: string, cmd: string, args: string[]) : Promise { +export function executeCmd( + logger: ILogger, + verbose: boolean, + cwd: string, + cmd: string, + args: string[] +): Promise { return new Promise((resolve, reject) => { if (verbose) { - logOut(logger, colors.green(`Executing: ${cmd} ${args.join(' ')}`)); + logOut(logger, colors.green(`Executing: ${cmd} ${args.join(" ")}`)); } const child = spawn(cmd, args, { cwd: cwd, windowsHide: true, - shell: true, + shell: true }); - child.stdout.on('data', data => logger.out(colors.grey(data.toString()))); - child.stderr.on('data', data => { + child.stdout.on("data", (data) => logger.out(colors.grey(data.toString()))); + child.stderr.on("data", (data) => { const message = data.toString(); logger.err(colors.red(message)); - if (message.indexOf('FATAL ERROR') > -1 && message.indexOf('Allocation failed - JavaScript heap out of memory') > -1) { - reject('Child process has run out of memory'); + if ( + message.indexOf("FATAL ERROR") > -1 && + message.indexOf("Allocation failed - JavaScript heap out of memory") > + -1 + ) { + reject("Child process has run out of memory"); } }); - child.on('error', err => { + child.on("error", (err) => { reject(err); }); - child.on('exit', code => { + child.on("exit", (code) => { if (code !== 0) { reject(`Exited with code ${code}`); } else { @@ -121,7 +140,7 @@ export function logErr(logger: ILogger, line: any) { export async function getLogger(logFilePath: string): Promise { await rm(logFilePath, { force: true }); - const logFileStream = createWriteStream(logFilePath, { flags: 'a' }); + const logFileStream = createWriteStream(logFilePath, { flags: "a" }); return { out: (data: string) => { @@ -131,6 +150,6 @@ export async function getLogger(logFilePath: string): Promise { err: (data: string) => { process.stdout.write(data); logFileStream.write(colors.stripColors(data)); - }, + } }; -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/generator/.eslintrc.js b/hack/bicep-types-radius/src/generator/.eslintrc.js index b53ea967270..3ac4a201861 100644 --- a/hack/bicep-types-radius/src/generator/.eslintrc.js +++ b/hack/bicep-types-radius/src/generator/.eslintrc.js @@ -29,18 +29,15 @@ module.exports = { "line", [ " Copyright 2023 The Radius Authors.", - " # ------------------------------------------------------------ + " # ------------------------------------------------------------", ], ], }, overrides: [ { files: ["*.ts"], - extends: [ - "plugin:@typescript-eslint/recommended", - ], - rules: { - }, + extends: ["plugin:@typescript-eslint/recommended"], + rules: {}, }, { files: ["*.js"], diff --git a/hack/bicep-types-radius/src/generator/package.json b/hack/bicep-types-radius/src/generator/package.json index 9ea599c1654..5aa397e1332 100644 --- a/hack/bicep-types-radius/src/generator/package.json +++ b/hack/bicep-types-radius/src/generator/package.json @@ -47,4 +47,4 @@ "typescript": "^5.6.3", "yargs": "^17.7.2" } -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/generator/src/Bicep.TypeGen.Autorest/packages.lock.json b/hack/bicep-types-radius/src/generator/src/Bicep.TypeGen.Autorest/packages.lock.json index 47d0437d9fc..7df9bbb8111 100644 --- a/hack/bicep-types-radius/src/generator/src/Bicep.TypeGen.Autorest/packages.lock.json +++ b/hack/bicep-types-radius/src/generator/src/Bicep.TypeGen.Autorest/packages.lock.json @@ -540,4 +540,4 @@ } } } -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/generator/src/cmd/generate.ts b/hack/bicep-types-radius/src/generator/src/cmd/generate.ts index e3507a5368c..99d289025fd 100644 --- a/hack/bicep-types-radius/src/generator/src/cmd/generate.ts +++ b/hack/bicep-types-radius/src/generator/src/cmd/generate.ts @@ -13,55 +13,97 @@ // See the License for the specific language governing permissions and // limitations under the License. // ------------------------------------------------------------. -import os from 'os'; -import path from 'path'; -import { existsSync } from 'fs'; -import { mkdir, rm, writeFile, readFile } from 'fs/promises'; -import yargs from 'yargs'; -import { Dictionary } from 'lodash'; -import { TypeFile, buildIndex, readTypesJson, writeIndexJson, writeIndexMarkdown, TypeSettings } from 'bicep-types'; -import { GeneratorConfig, getConfig } from '../config'; -import * as markdown from '@ts-common/commonmark-to-markdown' -import * as yaml from 'js-yaml' -import { copyRecursive, executeSynchronous, getLogger, lowerCaseCompare, logErr, logOut, ILogger, defaultLogger, executeCmd, findRecursive } from '../utils'; +import os from "os"; +import path from "path"; +import { existsSync } from "fs"; +import { mkdir, rm, writeFile, readFile } from "fs/promises"; +import yargs from "yargs"; +import { Dictionary } from "lodash"; +import { + TypeFile, + buildIndex, + readTypesJson, + writeIndexJson, + writeIndexMarkdown, + TypeSettings, +} from "bicep-types"; +import { GeneratorConfig, getConfig } from "../config"; +import * as markdown from "@ts-common/commonmark-to-markdown"; +import * as yaml from "js-yaml"; +import { + copyRecursive, + executeSynchronous, + getLogger, + lowerCaseCompare, + logErr, + logOut, + ILogger, + defaultLogger, + executeCmd, + findRecursive, +} from "../utils"; const rootDir = `${__dirname}/../../../../`; const extensionDir = path.resolve(`${rootDir}/src/autorest.bicep/`); -const autorestBinary = os.platform() === 'win32' ? 'autorest.cmd' : 'autorest'; +const autorestBinary = os.platform() === "win32" ? "autorest.cmd" : "autorest"; const defaultOutDir = path.resolve(`${rootDir}/generated`); const argsConfig = yargs .strict() - .option('specs-dir', { type: 'string', demandOption: true, desc: 'Path to the azure-rest-api-specs dir' }) - .option('out-dir', { type: 'string', default: defaultOutDir, desc: 'Output path for generated files' }) - .option('release-version', { type: 'string', default: 'latest', desc: 'The version of the generated types' }) - .option('single-path', { type: 'string', default: undefined, desc: 'Only regenerate under a specific file path - e.g. "compute"' }) - .option('verbose', { type: 'boolean', default: false, desc: 'Enable autorest verbose logging' }) - .option('wait-for-debugger', { type: 'boolean', default: false, desc: 'Wait for a C# debugger to be attached before running the Autorest extension' }); + .option("specs-dir", { + type: "string", + demandOption: true, + desc: "Path to the azure-rest-api-specs dir", + }) + .option("out-dir", { + type: "string", + default: defaultOutDir, + desc: "Output path for generated files", + }) + .option("release-version", { + type: "string", + default: "latest", + desc: "The version of the generated types", + }) + .option("single-path", { + type: "string", + default: undefined, + desc: 'Only regenerate under a specific file path - e.g. "compute"', + }) + .option("verbose", { + type: "boolean", + default: false, + desc: "Enable autorest verbose logging", + }) + .option("wait-for-debugger", { + type: "boolean", + default: false, + desc: "Wait for a C# debugger to be attached before running the Autorest extension", + }); executeSynchronous(async () => { - const args = await argsConfig.parseAsync(); - const inputBaseDir = path.resolve(args['specs-dir']); - const outputBaseDir = path.resolve(args['out-dir']); - const version = args['release-version']; - const verbose = args['verbose']; - const waitForDebugger = args['wait-for-debugger']; - const singlePath = args['single-path']; + const args = await argsConfig.parseAsync(); + const inputBaseDir = path.resolve(args["specs-dir"]); + const outputBaseDir = path.resolve(args["out-dir"]); + const version = args["release-version"]; + const verbose = args["verbose"]; + const waitForDebugger = args["wait-for-debugger"]; + const singlePath = args["single-path"]; if (!existsSync(`${extensionDir}/dist`)) { throw `Unable to find ${extensionDir}/dist. Did you forget to run 'npm run build'?`; } // find all readme paths in the azure-rest-api-specs repo - const specsPath = path.join(inputBaseDir, 'specification'); + const specsPath = path.join(inputBaseDir, "specification"); const readmePaths = await findReadmePaths(specsPath); if (readmePaths.length === 0) { throw `Unable to find rest-api-specs in folder ${inputBaseDir}`; } const tmpOutputPath = `${os.tmpdir()}/_bcp_${new Date().getTime()}`; - await rm(tmpOutputPath, { recursive: true, force: true, }); + await rm(tmpOutputPath, { recursive: true, force: true }); // this file is deliberately gitignored as it'll be overwritten when using --single-path // it's used to generate the git commit message @@ -71,7 +113,10 @@ executeSynchronous(async () => { // use consistent sorting to make log changes easier to review for (const readmePath of readmePaths.sort(lowerCaseCompare)) { const bicepReadmePath = `${path.dirname(readmePath)}/readme.bicep.md`; - const basePath = path.relative(specsPath, readmePath).split(path.sep)[0].toLowerCase(); + const basePath = path + .relative(specsPath, readmePath) + .split(path.sep)[0] + .toLowerCase(); const tmpOutputDir = `${tmpOutputPath}/${basePath}`; const outputDir = `${outputBaseDir}/${basePath}`; @@ -80,7 +125,7 @@ executeSynchronous(async () => { } // prepare temp dir for output - await rm(tmpOutputDir, { recursive: true, force: true, }); + await rm(tmpOutputDir, { recursive: true, force: true }); await mkdir(tmpOutputDir, { recursive: true }); const logger = await getLogger(`${tmpOutputDir}/out.log`); const config = getConfig(basePath); @@ -88,29 +133,37 @@ executeSynchronous(async () => { try { // autorest readme.bicep.md files are not checked in, so we must generate them before invoking autorest await generateAutorestConfig(logger, readmePath, bicepReadmePath, config); - await generateSchema(logger, readmePath, tmpOutputDir, verbose, waitForDebugger); + await generateSchema( + logger, + readmePath, + tmpOutputDir, + verbose, + waitForDebugger, + ); // remove all previously-generated files and copy over results - await rm(outputDir, { recursive: true, force: true, }); + await rm(outputDir, { recursive: true, force: true }); await mkdir(outputDir, { recursive: true }); await copyRecursive(tmpOutputDir, outputDir); } catch (err) { logErr(logger, err); - + // Use markdown formatting as this summary will be included in the PR description - logOut(summaryLogger, -`
+ logOut( + summaryLogger, + `
Failed to generate types for path '${basePath}' \`\`\` ${err} \`\`\`
-`); +`, + ); } // clean up temp dir - await rm(tmpOutputDir, { recursive: true, force: true, }); + await rm(tmpOutputDir, { recursive: true, force: true }); // clean up autorest readme.bicep.md files await rm(bicepReadmePath, { force: true }); } @@ -121,16 +174,22 @@ ${err} function normalizeJsonPath(jsonPath: string) { // eslint-disable-next-line no-useless-escape - return path.normalize(jsonPath).replace(/[\\\/]/g, '/'); + return path.normalize(jsonPath).replace(/[\\\/]/g, "/"); } -async function generateAutorestConfig(logger: ILogger, readmePath: string, bicepReadmePath: string, config: GeneratorConfig) { +async function generateAutorestConfig( + logger: ILogger, + readmePath: string, + bicepReadmePath: string, + config: GeneratorConfig, +) { // We expect a path format convention of /(preview|stable)/--
(|-preview)/.json // This information is used to generate individual tags in the generated autorest configuration // eslint-disable-next-line no-useless-escape - const pathRegex = /^(\$\(this-folder\)\/|)([^\/]+)\/[^\/]+\/(\d{4}-\d{2}-\d{2}(|-preview|-privatepreview))\/.*\.json$/i; + const pathRegex = + /^(\$\(this-folder\)\/|)([^\/]+)\/[^\/]+\/(\d{4}-\d{2}-\d{2}(|-preview|-privatepreview))\/.*\.json$/i; - const readmeContents = await readFile(readmePath, { encoding: 'utf8' }); + const readmeContents = await readFile(readmePath, { encoding: "utf8" }); const readmeMarkdown = markdown.parse(readmeContents); const inputFiles = new Set(config.additionalFiles); @@ -142,17 +201,21 @@ async function generateAutorestConfig(logger: ILogger, readmePath: string, bicep // ``` for (const node of markdown.iterate(readmeMarkdown.markDown)) { // We're only interested in yaml code blocks - if (node.type !== 'code_block' || !node.info || !node.literal || - !node.info.trim().startsWith('yaml')) { + if ( + node.type !== "code_block" || + !node.info || + !node.literal || + !node.info.trim().startsWith("yaml") + ) { continue; } - + // eslint-disable-next-line @typescript-eslint/no-explicit-any const yamlData = yaml.load(node.literal) as any; if (yamlData) { // input-file may be a single string or an array of strings - const inputFile = yamlData['input-file']; - if (typeof inputFile === 'string') { + const inputFile = yamlData["input-file"]; + if (typeof inputFile === "string") { inputFiles.add(inputFile); } else if (inputFile instanceof Array) { for (const i of inputFile) { @@ -185,14 +248,14 @@ async function generateAutorestConfig(logger: ILogger, readmePath: string, bicep ### Bicep multi-api \`\`\`yaml $(bicep) && $(multiapi) -${yaml.dump({ 'batch': Object.keys(filesByTag).map(tag => ({ 'tag': tag })) }, { lineWidth: 1000 })} +${yaml.dump({ batch: Object.keys(filesByTag).map((tag) => ({ tag: tag })) }, { lineWidth: 1000 })} \`\`\` `; for (const tag of Object.keys(filesByTag)) { generatedContent += `### Tag: ${tag} and bicep \`\`\`yaml $(tag) == '${tag}' && $(bicep) -${yaml.dump({ 'input-file': filesByTag[tag] }, { lineWidth: 1000})} +${yaml.dump({ "input-file": filesByTag[tag] }, { lineWidth: 1000 })} \`\`\` `; } @@ -200,64 +263,79 @@ ${yaml.dump({ 'input-file': filesByTag[tag] }, { lineWidth: 1000})} await writeFile(bicepReadmePath, generatedContent); } -async function generateSchema(logger: ILogger, readme: string, outputBaseDir: string, verbose: boolean, waitForDebugger: boolean) { +async function generateSchema( + logger: ILogger, + readme: string, + outputBaseDir: string, + verbose: boolean, + waitForDebugger: boolean, +) { let autoRestParams = [ `--use=@autorest/modelerfour`, `--use=${extensionDir}`, - '--bicep', + "--bicep", `--output-folder=${outputBaseDir}`, `--multiapi`, - '--title=none', + "--title=none", // This is necessary to avoid failures such as "ERROR: Semantic violation: Discriminator must be a required property." blocking type generation. // In an ideal world, we'd raise issues in https://github.com/Azure/azure-rest-api-specs and force RP teams to fix them, but this isn't very practical - // as new validations are added continuously, and there's often quite a lag before teams will fix them - we don't want to be blocked by this in generating types. + // as new validations are added continuously, and there's often quite a lag before teams will fix them - we don't want to be blocked by this in generating types. `--skip-semantics-validation`, readme, ]; if (verbose) { - autoRestParams = autoRestParams.concat([ - `--debug`, - `--verbose`, - ]); + autoRestParams = autoRestParams.concat([`--debug`, `--verbose`]); } if (waitForDebugger) { - autoRestParams = autoRestParams.concat([ - `--bicep.debugger`, - ]); + autoRestParams = autoRestParams.concat([`--bicep.debugger`]); } - return await executeCmd(logger, verbose, __dirname, autorestBinary, autoRestParams); + return await executeCmd( + logger, + verbose, + __dirname, + autorestBinary, + autoRestParams, + ); } async function findReadmePaths(specsPath: string) { - return await findRecursive(specsPath, filePath => { - if (path.basename(filePath) !== 'readme.md') { + return await findRecursive(specsPath, (filePath) => { + if (path.basename(filePath) !== "readme.md") { return false; } return filePath .split(path.sep) - .some(parent => parent == 'resource-manager'); + .some((parent) => parent == "resource-manager"); }); } -async function buildTypeIndex(logger: ILogger, baseDir: string, version: string) { - const typesPaths = await findRecursive(baseDir, filePath => { - return path.basename(filePath) === 'types.json'; +async function buildTypeIndex( + logger: ILogger, + baseDir: string, + version: string, +) { + const typesPaths = await findRecursive(baseDir, (filePath) => { + return path.basename(filePath) === "types.json"; }); const typeFiles: TypeFile[] = []; for (const typePath of typesPaths) { - const content = await readFile(typePath, { encoding: 'utf8' }); + const content = await readFile(typePath, { encoding: "utf8" }); typeFiles.push({ relativePath: path.relative(baseDir, typePath), types: readTypesJson(content), }); } - const indexContent = await buildIndex(typeFiles, log => logOut(logger, log), {name: "Radius", version: version, isSingleton: false} as TypeSettings); + const indexContent = await buildIndex( + typeFiles, + (log) => logOut(logger, log), + { name: "Radius", version: version, isSingleton: false } as TypeSettings, + ); await writeFile(`${baseDir}/index.json`, writeIndexJson(indexContent)); await writeFile(`${baseDir}/index.md`, writeIndexMarkdown(indexContent)); -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/generator/src/config.ts b/hack/bicep-types-radius/src/generator/src/config.ts index a6178be12cc..0efb950b2b9 100644 --- a/hack/bicep-types-radius/src/generator/src/config.ts +++ b/hack/bicep-types-radius/src/generator/src/config.ts @@ -21,19 +21,19 @@ export interface GeneratorConfig { const defaultConfig: GeneratorConfig = { additionalFiles: [], -} +}; const config: Dictionary = { - 'keyvault': { + keyvault: { additionalFiles: [ - 'Microsoft.KeyVault/stable/2016-10-01/secrets.json', - 'Microsoft.KeyVault/stable/2018-02-14/secrets.json', - 'Microsoft.KeyVault/preview/2018-02-14-preview/secrets.json', - 'Microsoft.KeyVault/stable/2019-09-01/secrets.json', + "Microsoft.KeyVault/stable/2016-10-01/secrets.json", + "Microsoft.KeyVault/stable/2018-02-14/secrets.json", + "Microsoft.KeyVault/preview/2018-02-14-preview/secrets.json", + "Microsoft.KeyVault/stable/2019-09-01/secrets.json", ], - } -} + }, +}; export function getConfig(basePath: string): GeneratorConfig { return config[basePath.toLowerCase()] || defaultConfig; -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/generator/src/utils.ts b/hack/bicep-types-radius/src/generator/src/utils.ts index 09113b17936..fa1a4bb283b 100644 --- a/hack/bicep-types-radius/src/generator/src/utils.ts +++ b/hack/bicep-types-radius/src/generator/src/utils.ts @@ -10,12 +10,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // ------------------------------------------------------------. -import path from 'path'; -import { createWriteStream } from 'fs'; -import { readdir, stat, mkdir, rm, copyFile } from 'fs/promises'; -import { series } from 'async'; -import { spawn } from 'child_process'; -import colors from 'colors'; +import path from "path"; +import { createWriteStream } from "fs"; +import { readdir, stat, mkdir, rm, copyFile } from "fs/promises"; +import { series } from "async"; +import { spawn } from "child_process"; +import colors from "colors"; export interface ILogger { out: (data: string) => void; @@ -23,20 +23,29 @@ export interface ILogger { } export const defaultLogger: ILogger = { - out: data => process.stdout.write(data), - err: data => process.stderr.write(data), -} - -export async function copyRecursive(sourceBasePath: string, destinationBasePath: string): Promise { + out: (data) => process.stdout.write(data), + err: (data) => process.stderr.write(data), +}; + +export async function copyRecursive( + sourceBasePath: string, + destinationBasePath: string, +): Promise { for (const filePath of await findRecursive(sourceBasePath, () => true)) { - const destinationPath = path.join(destinationBasePath, path.relative(sourceBasePath, filePath)); + const destinationPath = path.join( + destinationBasePath, + path.relative(sourceBasePath, filePath), + ); await mkdir(path.dirname(destinationPath), { recursive: true }); await copyFile(filePath, destinationPath); } } -export async function findRecursive(basePath: string, filter: (name: string) => boolean): Promise { +export async function findRecursive( + basePath: string, + filter: (name: string) => boolean, +): Promise { let results: string[] = []; for (const subPathName of await readdir(basePath)) { @@ -63,10 +72,16 @@ export async function findRecursive(basePath: string, filter: (name: string) => return results; } -export function executeCmd(logger: ILogger, verbose: boolean, cwd: string, cmd: string, args: string[]) : Promise { +export function executeCmd( + logger: ILogger, + verbose: boolean, + cwd: string, + cmd: string, + args: string[], +): Promise { return new Promise((resolve, reject) => { if (verbose) { - logOut(logger, colors.green(`Executing: ${cmd} ${args.join(' ')}`)); + logOut(logger, colors.green(`Executing: ${cmd} ${args.join(" ")}`)); } const child = spawn(cmd, args, { @@ -75,19 +90,23 @@ export function executeCmd(logger: ILogger, verbose: boolean, cwd: string, cmd: shell: true, }); - child.stdout.on('data', data => logger.out(colors.grey(data.toString()))); - child.stderr.on('data', data => { + child.stdout.on("data", (data) => logger.out(colors.grey(data.toString()))); + child.stderr.on("data", (data) => { const message = data.toString(); logger.err(colors.red(message)); - if (message.indexOf('FATAL ERROR') > -1 && message.indexOf('Allocation failed - JavaScript heap out of memory') > -1) { - reject('Child process has run out of memory'); + if ( + message.indexOf("FATAL ERROR") > -1 && + message.indexOf("Allocation failed - JavaScript heap out of memory") > + -1 + ) { + reject("Child process has run out of memory"); } }); - child.on('error', err => { + child.on("error", (err) => { reject(err); }); - child.on('exit', code => { + child.on("exit", (code) => { if (code !== 0) { reject(`Exited with code ${code}`); } else { @@ -98,13 +117,11 @@ export function executeCmd(logger: ILogger, verbose: boolean, cwd: string, cmd: } export function executeSynchronous(asyncFunc: () => Promise) { - series( - [asyncFunc], - (error) => { - if (error) { - throw error; - } - }); + series([asyncFunc], (error) => { + if (error) { + throw error; + } + }); } export function lowerCaseCompare(a: string, b: string) { @@ -129,7 +146,7 @@ export function logErr(logger: ILogger, line: any) { export async function getLogger(logFilePath: string): Promise { await rm(logFilePath, { force: true }); - const logFileStream = createWriteStream(logFilePath, { flags: 'a' }); + const logFileStream = createWriteStream(logFilePath, { flags: "a" }); return { out: (data: string) => { @@ -141,4 +158,4 @@ export async function getLogger(logFilePath: string): Promise { logFileStream.write(colors.stripColors(data)); }, }; -} \ No newline at end of file +} diff --git a/hack/bicep-types-radius/src/generator/tsconfig.json b/hack/bicep-types-radius/src/generator/tsconfig.json index 17bf5887e86..2ff40cfd1e7 100644 --- a/hack/bicep-types-radius/src/generator/tsconfig.json +++ b/hack/bicep-types-radius/src/generator/tsconfig.json @@ -19,4 +19,4 @@ "rootDir": "." }, "exclude": ["dist", "node_modules"] -} \ No newline at end of file +} diff --git a/pkg/armrpc/api/v1/testdata/armrpcheaders.json b/pkg/armrpc/api/v1/testdata/armrpcheaders.json index 13b281f84b3..472741b1c08 100644 --- a/pkg/armrpc/api/v1/testdata/armrpcheaders.json +++ b/pkg/armrpc/api/v1/testdata/armrpcheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-RG/providers/Applications.Core/environments/Env0?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-RG/providers/Applications.Core/environments/Env0?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:54:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-RG/providers/Applications.Core/environments/Env0?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-RG/providers/Applications.Core/environments/Env0?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:54:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/armsubscriptionheaders.json b/pkg/armrpc/frontend/defaultoperation/testdata/armsubscriptionheaders.json index 5639136a10b..47263469dd8 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/armsubscriptionheaders.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/armsubscriptionheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions?api-version=2.0", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io/subscriptions?api-version=2.0", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions?api-version=2.0", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io/subscriptions?api-version=2.0", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/operationresult_requestheaders.json b/pkg/armrpc/frontend/defaultoperation/testdata/operationresult_requestheaders.json index 96531ef91f1..18dcbbf7854 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/operationresult_requestheaders.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/operationresult_requestheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationResults/00000000-0000-0000-0000-000000000000", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationStatuses/00000000-0000-0000-0000-000000000000", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationResults/00000000-0000-0000-0000-000000000000", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationStatuses/00000000-0000-0000-0000-000000000000", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/operationresult_responseheaders.json b/pkg/armrpc/frontend/defaultoperation/testdata/operationresult_responseheaders.json index e047673dbe1..703de0dfefe 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/operationresult_responseheaders.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/operationresult_responseheaders.json @@ -1,4 +1,4 @@ { - "Location": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationResults/00000000-0000-0000-0000-000000000000", - "Retry-After": 60 -} \ No newline at end of file + "Location": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationResults/00000000-0000-0000-0000-000000000000", + "Retry-After": 60 +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_datamodel.json b/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_datamodel.json index 83bfbf97a24..85823f30ea1 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_datamodel.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_datamodel.json @@ -1,16 +1,16 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationsStatuses/00000000-0000-0000-0000-000000000000", - "name": "op0", - "type": "Applications.Core/operationStatuses", - "operationType": "PUT", - "location": "West US", - "status": "Succeeded", - "startTime": "2022-05-16T10:24:58.000000Z", - "endTime": "2022-05-16T17:24:58.000000Z", - "percentComplete": "100", - "properties": { - "provisioningState": "Succeeded" - }, - "error": {}, - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationsStatuses/00000000-0000-0000-0000-000000000000" -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationsStatuses/00000000-0000-0000-0000-000000000000", + "name": "op0", + "type": "Applications.Core/operationStatuses", + "operationType": "PUT", + "location": "West US", + "status": "Succeeded", + "startTime": "2022-05-16T10:24:58.000000Z", + "endTime": "2022-05-16T17:24:58.000000Z", + "percentComplete": "100", + "properties": { + "provisioningState": "Succeeded" + }, + "error": {}, + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationsStatuses/00000000-0000-0000-0000-000000000000" +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_output.json b/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_output.json index 42602e8d6f1..10ae94d788a 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_output.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_output.json @@ -1,15 +1,15 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationsStatuses/00000000-0000-0000-0000-000000000000", - "name": "op0", - "type": "Applications.Core/operationStatuses", - "operationType": "PUT", - "location": "West US", - "status": "Succeeded", - "startTime": "2022-05-16T10:24:58.000000Z", - "endTime": "2022-05-16T17:24:58.000000Z", - "percentComplete": "100", - "properties": { - "provisioningState": "Succeeded" - }, - "error": {} -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationsStatuses/00000000-0000-0000-0000-000000000000", + "name": "op0", + "type": "Applications.Core/operationStatuses", + "operationType": "PUT", + "location": "West US", + "status": "Succeeded", + "startTime": "2022-05-16T10:24:58.000000Z", + "endTime": "2022-05-16T17:24:58.000000Z", + "percentComplete": "100", + "properties": { + "provisioningState": "Succeeded" + }, + "error": {} +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_requestheaders.json b/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_requestheaders.json index b68de65fffc..553c83b7aff 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_requestheaders.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/operationstatus_requestheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationStatuses/00000000-0000-0000-0000-000000000000", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationStatuses/00000000-0000-0000-0000-000000000000", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationStatuses/00000000-0000-0000-0000-000000000000", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/providers/Applications.Core/locations/westus/operationStatuses/00000000-0000-0000-0000-000000000000", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/registeredsubscriptiontestdata.json b/pkg/armrpc/frontend/defaultoperation/testdata/registeredsubscriptiontestdata.json index 4f87dcae0f4..934bf752810 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/registeredsubscriptiontestdata.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/registeredsubscriptiontestdata.json @@ -1,34 +1,34 @@ { - "state": "Registered", - "registrationDate": "Sat, 19 Mar 2022 04:39:55 GMT", - "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "locationPlacementId": "Public_2014-09-01", - "quotaId": "PayAsYouGo_2014-09-01", - "accountOwner": { - "puid": "", - "email": "" - }, - "registeredFeatures": [], - "managedByTenants": [], - "additionalProperties": { - "resourceProviderProperties": "{\"resourceProviderNamespace\":\"Applications.Core\"}", - "billingProperties": { - "channelType": "CustomerLed", - "paymentType": "Paid", - "workloadType": "Production", - "billingType": "Modern", - "tier": "Standard", - "billingAccount": { - "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000_2019-05-31" - } - }, - "promotions": [ - { - "category": "freetier", - "endDateTime": "2023-02-11T21:07:45.676671Z" - } - ] + "state": "Registered", + "registrationDate": "Sat, 19 Mar 2022 04:39:55 GMT", + "properties": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "locationPlacementId": "Public_2014-09-01", + "quotaId": "PayAsYouGo_2014-09-01", + "accountOwner": { + "puid": "", + "email": "" + }, + "registeredFeatures": [], + "managedByTenants": [], + "additionalProperties": { + "resourceProviderProperties": "{\"resourceProviderNamespace\":\"Applications.Core\"}", + "billingProperties": { + "channelType": "CustomerLed", + "paymentType": "Paid", + "workloadType": "Production", + "billingType": "Modern", + "tier": "Standard", + "billingAccount": { + "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000_2019-05-31" } + }, + "promotions": [ + { + "category": "freetier", + "endDateTime": "2023-02-11T21:07:45.676671Z" + } + ] } -} \ No newline at end of file + } +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/resource-datamodel.json b/pkg/armrpc/frontend/defaultoperation/testdata/resource-datamodel.json index d66ad78e5f3..b26eb830600 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/resource-datamodel.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/resource-datamodel.json @@ -30,4 +30,4 @@ "resourceGroup": "radius-test-rg", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/resource-request-invalidapp.json b/pkg/armrpc/frontend/defaultoperation/testdata/resource-request-invalidapp.json index 496f1cc57d9..419ac433891 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/resource-request-invalidapp.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/resource-request-invalidapp.json @@ -1,9 +1,9 @@ { - "location": "global", - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/invalid", - "propertyA": "propertyAValue", - "propertyB": "propertyBValue" - } -} \ No newline at end of file + "location": "global", + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/invalid", + "propertyA": "propertyAValue", + "propertyB": "propertyBValue" + } +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/resource-request.json b/pkg/armrpc/frontend/defaultoperation/testdata/resource-request.json index 38403771bf9..7cc4bdd483d 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/resource-request.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/resource-request.json @@ -1,9 +1,9 @@ { - "location": "global", - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "propertyA": "propertyAValue", - "propertyB": "propertyBValue" - } -} \ No newline at end of file + "location": "global", + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/app0", + "propertyA": "propertyAValue", + "propertyB": "propertyBValue" + } +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/resource-response.json b/pkg/armrpc/frontend/defaultoperation/testdata/resource-response.json index bd3d2a8ef49..714f97e3080 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/resource-response.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/resource-response.json @@ -26,4 +26,4 @@ }, "tags": {}, "type": "applications.core/resources" -} \ No newline at end of file +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-datamodel.json b/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-datamodel.json index e829b149c9e..36d651f57c2 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-datamodel.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-datamodel.json @@ -1,17 +1,17 @@ { - "id": "/planes/radius/local", - "name": "local", - "type": "radius", - "location": "West US", - "provisioningState": "Succeeded", - "properties": { - "kind": "UCPNative", - "resourceProviders": { - "Applications.Connection": "http://localhost:9081/", - "Applications.Core": "http://localhost:9080/" - } - }, - "tenantId": "00000000-0000-0000-0000-000000000000", - "createdApiVersion": "2023-10-01-preview", - "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file + "id": "/planes/radius/local", + "name": "local", + "type": "radius", + "location": "West US", + "provisioningState": "Succeeded", + "properties": { + "kind": "UCPNative", + "resourceProviders": { + "Applications.Connection": "http://localhost:9081/", + "Applications.Core": "http://localhost:9080/" + } + }, + "tenantId": "00000000-0000-0000-0000-000000000000", + "createdApiVersion": "2023-10-01-preview", + "updatedApiVersion": "2023-10-01-preview" +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-request-invalid.json b/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-request-invalid.json index a46b3fd7ad5..34bdde3ed3c 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-request-invalid.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-request-invalid.json @@ -1,8 +1,7 @@ { - "location": "global", - "properties": { - "kind": "UCPNative", - "resourceProviders": { - } - } -} \ No newline at end of file + "location": "global", + "properties": { + "kind": "UCPNative", + "resourceProviders": {} + } +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-request.json b/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-request.json index 4bdb98751c4..f22d7e03b44 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-request.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/resource-sync-request.json @@ -1,10 +1,10 @@ { - "location": "global", - "properties": { - "kind": "UCPNative", - "resourceProviders": { - "Applications.Connection": "http://localhost:9081/", - "Applications.Core": "http://localhost:9080/" - } + "location": "global", + "properties": { + "kind": "UCPNative", + "resourceProviders": { + "Applications.Connection": "http://localhost:9081/", + "Applications.Core": "http://localhost:9080/" } -} \ No newline at end of file + } +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/resource_planescope_requestheaders.json b/pkg/armrpc/frontend/defaultoperation/testdata/resource_planescope_requestheaders.json index ea4466e92e0..d7128fdf6cb 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/resource_planescope_requestheaders.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/resource_planescope_requestheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/planes/radius/local/providers/applications.core/environments/env0?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/planes/radius/local/providers/Applications.Core/environments/env0?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/planes/radius/local/providers/applications.core/environments/env0?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/planes/radius/local/providers/Applications.Core/environments/env0?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/resource_requestheaders.json b/pkg/armrpc/frontend/defaultoperation/testdata/resource_requestheaders.json index a308ad7960a..3a7f7e2bce6 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/resource_requestheaders.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/resource_requestheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/armrpc/frontend/defaultoperation/testdata/unregisteredsubscriptiontestdata.json b/pkg/armrpc/frontend/defaultoperation/testdata/unregisteredsubscriptiontestdata.json index 03ae21c9683..6c648c4798e 100644 --- a/pkg/armrpc/frontend/defaultoperation/testdata/unregisteredsubscriptiontestdata.json +++ b/pkg/armrpc/frontend/defaultoperation/testdata/unregisteredsubscriptiontestdata.json @@ -1,34 +1,34 @@ { - "state": "Unregistered", - "registrationDate": "Sat, 19 Mar 2022 04:39:55 GMT", - "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "locationPlacementId": "Public_2014-09-01", - "quotaId": "PayAsYouGo_2014-09-01", - "accountOwner": { - "puid": "", - "email": "" - }, - "registeredFeatures": [], - "managedByTenants": [], - "additionalProperties": { - "resourceProviderProperties": "{\"resourceProviderNamespace\":\"Applications.Core\"}", - "billingProperties": { - "channelType": "CustomerLed", - "paymentType": "Paid", - "workloadType": "Production", - "billingType": "Modern", - "tier": "Standard", - "billingAccount": { - "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000_2019-05-31" - } - }, - "promotions": [ - { - "category": "freetier", - "endDateTime": "2023-02-11T21:07:45.676671Z" - } - ] + "state": "Unregistered", + "registrationDate": "Sat, 19 Mar 2022 04:39:55 GMT", + "properties": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "locationPlacementId": "Public_2014-09-01", + "quotaId": "PayAsYouGo_2014-09-01", + "accountOwner": { + "puid": "", + "email": "" + }, + "registeredFeatures": [], + "managedByTenants": [], + "additionalProperties": { + "resourceProviderProperties": "{\"resourceProviderNamespace\":\"Applications.Core\"}", + "billingProperties": { + "channelType": "CustomerLed", + "paymentType": "Paid", + "workloadType": "Production", + "billingType": "Modern", + "tier": "Standard", + "billingAccount": { + "id": "/providers/Microsoft.Billing/billingAccounts/00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000_2019-05-31" } + }, + "promotions": [ + { + "category": "freetier", + "endDateTime": "2023-02-11T21:07:45.676671Z" + } + ] } -} \ No newline at end of file + } +} diff --git a/pkg/cli/bicep/testdata/test-extractparameters.json b/pkg/cli/bicep/testdata/test-extractparameters.json index dac1e93ea8f..5e43cb8232d 100644 --- a/pkg/cli/bicep/testdata/test-extractparameters.json +++ b/pkg/cli/bicep/testdata/test-extractparameters.json @@ -1,24 +1,22 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "languageVersion": "1.9-experimental", - "contentVersion": "1.0.0.0", - "metadata": { + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "languageVersion": "1.9-experimental", + "contentVersion": "1.0.0.0", + "metadata": {}, + "parameters": { + "location": { + "type": "string", + "defaultValue": "westus2", + "metadata": { + "description": "Specifies the location for resources." + } }, - "parameters": { - "location": { - "type": "string", - "defaultValue": "westus2", - "metadata": { - "description": "Specifies the location for resources." - } - }, - "application": { - "type": "string", - "metadata": { - "description": "Specifies the application for resources." - } - } - }, - "resources": { + "application": { + "type": "string", + "metadata": { + "description": "Specifies the application for resources." + } } -} \ No newline at end of file + }, + "resources": {} +} diff --git a/pkg/cli/bicep/testdata/test-injectappid.json b/pkg/cli/bicep/testdata/test-injectappid.json index 82616a15804..9be12f5fad6 100644 --- a/pkg/cli/bicep/testdata/test-injectappid.json +++ b/pkg/cli/bicep/testdata/test-injectappid.json @@ -1,36 +1,35 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "languageVersion": "1.9-experimental", - "contentVersion": "1.0.0.0", - "metadata": { - "EXPERIMENTAL_WARNING": "Symbolic name support in ARM is experimental, and should be enabled for testing purposes only. Do not enable this setting for any production usage, or you may be unexpectedly broken at any time!", - "_generator": { - "name": "bicep", - "version": "0.7.10.37724", - "templateHash": "2346558594741670581" - } - }, - "parameters": { - "location": { - "type": "string", - "defaultValue": "westus2", - "metadata": { - "description": "Specifies the location for resources." - } - }, - "application": { - "type": "string", - "metadata": { - "description": "Specifies the application for resources." - } - } - }, - "imports": { - "radius": { - "provider": "Radius", - "version": "1.0" - } + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "languageVersion": "1.9-experimental", + "contentVersion": "1.0.0.0", + "metadata": { + "EXPERIMENTAL_WARNING": "Symbolic name support in ARM is experimental, and should be enabled for testing purposes only. Do not enable this setting for any production usage, or you may be unexpectedly broken at any time!", + "_generator": { + "name": "bicep", + "version": "0.7.10.37724", + "templateHash": "2346558594741670581" + } + }, + "parameters": { + "location": { + "type": "string", + "defaultValue": "westus2", + "metadata": { + "description": "Specifies the location for resources." + } }, - "resources": { + "application": { + "type": "string", + "metadata": { + "description": "Specifies the application for resources." + } + } + }, + "imports": { + "radius": { + "provider": "Radius", + "version": "1.0" } -} \ No newline at end of file + }, + "resources": {} +} diff --git a/pkg/cli/bicep/testdata/test-injectenvid.json b/pkg/cli/bicep/testdata/test-injectenvid.json index 28a4a5d865f..02d1f3fb54e 100644 --- a/pkg/cli/bicep/testdata/test-injectenvid.json +++ b/pkg/cli/bicep/testdata/test-injectenvid.json @@ -1,64 +1,62 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "languageVersion": "1.9-experimental", - "contentVersion": "1.0.0.0", - "metadata": { - "EXPERIMENTAL_WARNING": "Symbolic name support in ARM is experimental, and should be enabled for testing purposes only. Do not enable this setting for any production usage, or you may be unexpectedly broken at any time!", - "_generator": { - "name": "bicep", - "version": "0.7.10.37724", - "templateHash": "2346558594741670581" - } - }, - "parameters": { - "location": { - "type": "string", - "defaultValue": "westus2", - "metadata": { - "description": "Specifies the location for resources." - } - }, - "environment": { - "type": "string", - "metadata": { - "description": "Specifies the environment for resources." - } - } + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "languageVersion": "1.9-experimental", + "contentVersion": "1.0.0.0", + "metadata": { + "EXPERIMENTAL_WARNING": "Symbolic name support in ARM is experimental, and should be enabled for testing purposes only. Do not enable this setting for any production usage, or you may be unexpectedly broken at any time!", + "_generator": { + "name": "bicep", + "version": "0.7.10.37724", + "templateHash": "2346558594741670581" + } + }, + "parameters": { + "location": { + "type": "string", + "defaultValue": "westus2", + "metadata": { + "description": "Specifies the location for resources." + } }, - "imports": { - "radius": { - "provider": "Radius", - "version": "1.0" + "environment": { + "type": "string", + "metadata": { + "description": "Specifies the environment for resources." + } + } + }, + "imports": { + "radius": { + "provider": "Radius", + "version": "1.0" + } + }, + "resources": { + "env": { + "import": "radius", + "type": "Applications.Core/environments@2023-10-01-preview", + "properties": { + "name": "corerp-resources-application-env", + "location": "[parameters('location')]", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "cluster" + } } + } }, - "resources": { - "env": { - "import": "radius", - "type": "Applications.Core/environments@2023-10-01-preview", - "properties": { - "name": "corerp-resources-application-env", - "location": "[parameters('location')]", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "cluster" - } - } - } - }, - "app": { - "import": "radius", - "type": "Applications.Core/applications@2023-10-01-preview", - "properties": { - "name": "corerp-resources-application-app", - "location": "[parameters('location')]", - "properties": { - "environment": "[reference('env').id]" - } - }, - "dependsOn": [ - "env" - ] + "app": { + "import": "radius", + "type": "Applications.Core/applications@2023-10-01-preview", + "properties": { + "name": "corerp-resources-application-app", + "location": "[parameters('location')]", + "properties": { + "environment": "[reference('env').id]" } + }, + "dependsOn": ["env"] } -} \ No newline at end of file + } +} diff --git a/pkg/cli/bicep/testdata/test-noenv.json b/pkg/cli/bicep/testdata/test-noenv.json index d0cce18f210..f22871c055f 100644 --- a/pkg/cli/bicep/testdata/test-noenv.json +++ b/pkg/cli/bicep/testdata/test-noenv.json @@ -1,58 +1,56 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "languageVersion": "1.9-experimental", - "contentVersion": "1.0.0.0", - "metadata": { - "EXPERIMENTAL_WARNING": "Symbolic name support in ARM is experimental, and should be enabled for testing purposes only. Do not enable this setting for any production usage, or you may be unexpectedly broken at any time!", - "_generator": { - "name": "bicep", - "version": "0.7.10.37724", - "templateHash": "2346558594741670581" - } - }, - "parameters": { - "location": { - "type": "string", - "defaultValue": "westus2", - "metadata": { - "description": "Specifies the location for resources." - } - } - }, - "imports": { - "radius": { - "provider": "Radius", - "version": "1.0" + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "languageVersion": "1.9-experimental", + "contentVersion": "1.0.0.0", + "metadata": { + "EXPERIMENTAL_WARNING": "Symbolic name support in ARM is experimental, and should be enabled for testing purposes only. Do not enable this setting for any production usage, or you may be unexpectedly broken at any time!", + "_generator": { + "name": "bicep", + "version": "0.7.10.37724", + "templateHash": "2346558594741670581" + } + }, + "parameters": { + "location": { + "type": "string", + "defaultValue": "westus2", + "metadata": { + "description": "Specifies the location for resources." + } + } + }, + "imports": { + "radius": { + "provider": "Radius", + "version": "1.0" + } + }, + "resources": { + "env": { + "import": "radius", + "type": "Applications.Core/environments@2023-10-01-preview", + "properties": { + "name": "corerp-resources-application-env", + "location": "[parameters('location')]", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "cluster" + } } + } }, - "resources": { - "env": { - "import": "radius", - "type": "Applications.Core/environments@2023-10-01-preview", - "properties": { - "name": "corerp-resources-application-env", - "location": "[parameters('location')]", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "cluster" - } - } - } - }, - "app": { - "import": "radius", - "type": "Applications.Core/applications@2023-10-01-preview", - "properties": { - "name": "corerp-resources-application-app", - "location": "[parameters('location')]", - "properties": { - "environment": "[reference('env').id]" - } - }, - "dependsOn": [ - "env" - ] + "app": { + "import": "radius", + "type": "Applications.Core/applications@2023-10-01-preview", + "properties": { + "name": "corerp-resources-application-app", + "location": "[parameters('location')]", + "properties": { + "environment": "[reference('env').id]" } + }, + "dependsOn": ["env"] } -} \ No newline at end of file + } +} diff --git a/pkg/cli/bicep/testdata/test-parameters.json b/pkg/cli/bicep/testdata/test-parameters.json index 0ef679ddd57..6a10cf46508 100644 --- a/pkg/cli/bicep/testdata/test-parameters.json +++ b/pkg/cli/bicep/testdata/test-parameters.json @@ -1,12 +1,12 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "param1": { - "value": "value1" - }, - "param2": { - "value": "value2" - } + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "param1": { + "value": "value1" + }, + "param2": { + "value": "value2" } + } } diff --git a/pkg/cli/cmd/recipe/register/testdata/recipeparam.json b/pkg/cli/cmd/recipe/register/testdata/recipeparam.json index 4af48b67d4e..4e3a6e2a5ac 100644 --- a/pkg/cli/cmd/recipe/register/testdata/recipeparam.json +++ b/pkg/cli/cmd/recipe/register/testdata/recipeparam.json @@ -1,9 +1,9 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "throughput": { - "value": 400 - } + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "throughput": { + "value": 400 } -} \ No newline at end of file + } +} diff --git a/pkg/cli/swagger/examples/GenericResources_CreateOrUpdate.json b/pkg/cli/swagger/examples/GenericResources_CreateOrUpdate.json index 2d36e7876b9..fb5255e1f98 100644 --- a/pkg/cli/swagger/examples/GenericResources_CreateOrUpdate.json +++ b/pkg/cli/swagger/examples/GenericResources_CreateOrUpdate.json @@ -40,4 +40,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/cli/swagger/examples/GenericResources_Delete.json b/pkg/cli/swagger/examples/GenericResources_Delete.json index 0f1465dcd7d..34d3996d9e8 100644 --- a/pkg/cli/swagger/examples/GenericResources_Delete.json +++ b/pkg/cli/swagger/examples/GenericResources_Delete.json @@ -12,4 +12,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/pkg/cli/swagger/examples/GenericResources_Get.json b/pkg/cli/swagger/examples/GenericResources_Get.json index 73bc1db2657..672e803cbc5 100644 --- a/pkg/cli/swagger/examples/GenericResources_Get.json +++ b/pkg/cli/swagger/examples/GenericResources_Get.json @@ -20,4 +20,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/cli/swagger/examples/GenericResources_ListByRootScope.json b/pkg/cli/swagger/examples/GenericResources_ListByRootScope.json index e5b8bc3dda0..3991c6da9aa 100644 --- a/pkg/cli/swagger/examples/GenericResources_ListByRootScope.json +++ b/pkg/cli/swagger/examples/GenericResources_ListByRootScope.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/cli/swagger/examples/GenericResources_ListSecrets.json b/pkg/cli/swagger/examples/GenericResources_ListSecrets.json index d81a94f2cab..ab6f6c73fcb 100644 --- a/pkg/cli/swagger/examples/GenericResources_ListSecrets.json +++ b/pkg/cli/swagger/examples/GenericResources_ListSecrets.json @@ -14,4 +14,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/cli/swagger/genericResource.json b/pkg/cli/swagger/genericResource.json index 752e5f9a8c0..91fafd58d66 100644 --- a/pkg/cli/swagger/genericResource.json +++ b/pkg/cli/swagger/genericResource.json @@ -6,20 +6,12 @@ "version": "2023-10-01-preview" }, "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], + "schemes": ["https"], + "consumes": ["application/json"], + "produces": ["application/json"], "security": [ { - "azure_auth": [ - "user_impersonation" - ] + "azure_auth": ["user_impersonation"] } ], "securityDefinitions": { @@ -38,17 +30,13 @@ "get": { "description": "Lists information about all resources of the given resource type in the given root scope", "operationId": "GenericResources_ListByRootScope", - "produces": [ - "application/json" - ], + "produces": ["application/json"], "x-ms-examples": { "GenericResourceListByRootScope": { "$ref": "./examples/GenericResourceListByRootScope.json" } }, - "tags": [ - "GenericResources" - ], + "tags": ["GenericResources"], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -84,17 +72,13 @@ "get": { "description": "Retrieves information about a generic resource with the name given of the type given within the root scope", "operationId": "GenericResources_Get", - "produces": [ - "application/json" - ], + "produces": ["application/json"], "x-ms-examples": { "GenericResources_Get": { "$ref": "./examples/GenericResources_Get.json" } }, - "tags": [ - "GenericResources" - ], + "tags": ["GenericResources"], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -127,17 +111,13 @@ "put": { "description": "Creates or updates a Generic resource", "operationId": "GenericResources_CreateOrUpdate", - "produces": [ - "application/json" - ], + "produces": ["application/json"], "x-ms-examples": { "GenericResources_CreateOrUpdate": { "$ref": "./examples/GenericResources_CreateOrUpdate.json" } }, - "tags": [ - "GenericResources" - ], + "tags": ["GenericResources"], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -189,17 +169,13 @@ "delete": { "description": "Deletes an existing Generic resource", "operationId": "GenericResources_Delete", - "produces": [ - "application/json" - ], + "produces": ["application/json"], "x-ms-examples": { "GenericResources_Delete": { "$ref": "./examples/GenericResources_Delete.json" } }, - "tags": [ - "GenericResources" - ], + "tags": ["GenericResources"], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -241,17 +217,13 @@ "post": { "description": "Lists secrets for a resource", "operationId": "GenericResources_ListSecrets", - "produces": [ - "application/json" - ], + "produces": ["application/json"], "x-ms-examples": { "GenericResources_ListSecrets": { "$ref": "./examples/GenericResources_ListSecrets.json" } }, - "tags": [ - "GenericResources" - ], + "tags": ["GenericResources"], "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -309,9 +281,7 @@ "$ref": "#/definitions/TrackedResource" } ], - "required": [ - "properties" - ], + "required": ["properties"], "properties": { "systemData": { "$ref": "#/definitions/systemData" @@ -364,10 +334,7 @@ "items": { "$ref": "#/definitions/ErrorDetail" }, - "x-ms-identifiers": [ - "message", - "target" - ], + "x-ms-identifiers": ["message", "target"], "description": "The error details." }, "additionalInfo": { @@ -407,25 +374,16 @@ "additionalProperties": { "type": "string" }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], + "x-ms-mutability": ["read", "create", "update"], "description": "Resource tags." }, "location": { "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], + "x-ms-mutability": ["read", "create"], "description": "The geo-location where the resource lives" } }, - "required": [ - "location" - ], + "required": ["location"], "allOf": [ { "$ref": "#/definitions/Resource" @@ -467,12 +425,7 @@ "createdByType": { "type": "string", "description": "The type of identity that created the resource.", - "enum": [ - "User", - "Application", - "ManagedIdentity", - "Key" - ], + "enum": ["User", "Application", "ManagedIdentity", "Key"], "x-ms-enum": { "name": "createdByType", "modelAsString": true @@ -490,12 +443,7 @@ "lastModifiedByType": { "type": "string", "description": "The type of identity that last modified the resource.", - "enum": [ - "User", - "Application", - "ManagedIdentity", - "Key" - ], + "enum": ["User", "Application", "ManagedIdentity", "Key"], "x-ms-enum": { "name": "createdByType", "modelAsString": true @@ -547,4 +495,4 @@ "x-ms-skip-url-encoding": true } } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/applicationresource.json b/pkg/corerp/api/v20231001preview/testdata/applicationresource.json index 8f9d12ed9ee..0ffb889ea7d 100644 --- a/pkg/corerp/api/v20231001preview/testdata/applicationresource.json +++ b/pkg/corerp/api/v20231001preview/testdata/applicationresource.json @@ -22,4 +22,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/applicationresourcedatamodel.json b/pkg/corerp/api/v20231001preview/testdata/applicationresourcedatamodel.json index 905722cc4a8..3651a80835a 100644 --- a/pkg/corerp/api/v20231001preview/testdata/applicationresourcedatamodel.json +++ b/pkg/corerp/api/v20231001preview/testdata/applicationresourcedatamodel.json @@ -45,4 +45,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/applicationresourcedatamodelemptyext.json b/pkg/corerp/api/v20231001preview/testdata/applicationresourcedatamodelemptyext.json index f580bcf7069..86ec2eb1de7 100644 --- a/pkg/corerp/api/v20231001preview/testdata/applicationresourcedatamodelemptyext.json +++ b/pkg/corerp/api/v20231001preview/testdata/applicationresourcedatamodelemptyext.json @@ -1,24 +1,24 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/app0", - "name": "app0", - "type": "Applications.Core/applications", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" - }, - "tags": { - "env": "dev" - }, - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "extensions": [ - { - "kind": "kubernetesMetadata" - } - ] - } - } \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/app0", + "name": "app0", + "type": "Applications.Core/applications", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "extensions": [ + { + "kind": "kubernetesMetadata" + } + ] + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/applicationresourceemptyext.json b/pkg/corerp/api/v20231001preview/testdata/applicationresourceemptyext.json index e930f185a62..f42db89a0de 100644 --- a/pkg/corerp/api/v20231001preview/testdata/applicationresourceemptyext.json +++ b/pkg/corerp/api/v20231001preview/testdata/applicationresourceemptyext.json @@ -1,13 +1,13 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/app0", - "name": "app0", - "type": "Applications.Core/applications", - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "extensions": [ - { - "kind": "kubernetesMetadata" - } - ] - } - } \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/app0", + "name": "app0", + "type": "Applications.Core/applications", + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "extensions": [ + { + "kind": "kubernetesMetadata" + } + ] + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/applicationresourceemptyext2.json b/pkg/corerp/api/v20231001preview/testdata/applicationresourceemptyext2.json index 4ae53837296..6aabb32770c 100644 --- a/pkg/corerp/api/v20231001preview/testdata/applicationresourceemptyext2.json +++ b/pkg/corerp/api/v20231001preview/testdata/applicationresourceemptyext2.json @@ -1,15 +1,15 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/app0", - "name": "app0", - "type": "Applications.Core/applications", - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "extensions": [ - { - "kind": "kubernetesMetadata", - "annotations": {}, - "labels": {} - } - ] - } - } \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/app0", + "name": "app0", + "type": "Applications.Core/applications", + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "extensions": [ + { + "kind": "kubernetesMetadata", + "annotations": {}, + "labels": {} + } + ] + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresource-manual.json b/pkg/corerp/api/v20231001preview/testdata/containerresource-manual.json index d8548c736ae..9d49e2aac4e 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresource-manual.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresource-manual.json @@ -14,4 +14,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresource-nil-env-variables.json b/pkg/corerp/api/v20231001preview/testdata/containerresource-nil-env-variables.json index 1716f56f5cf..5ed5e70d369 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresource-nil-env-variables.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresource-nil-env-variables.json @@ -18,9 +18,7 @@ "disableDefaultEnvVars": true, "iam": { "kind": "azure", - "roles": [ - "read" - ] + "roles": ["read"] } } }, @@ -36,15 +34,10 @@ "containerPort": 8080 }, "env": { - "DB_USER": { } + "DB_USER": {} }, - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -77,4 +70,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresource-runtimes.json b/pkg/corerp/api/v20231001preview/testdata/containerresource-runtimes.json index 0778865fdc7..27c4e682379 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresource-runtimes.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresource-runtimes.json @@ -18,9 +18,7 @@ "disableDefaultEnvVars": true, "iam": { "kind": "azure", - "roles": [ - "read" - ] + "roles": ["read"] } } }, @@ -35,13 +33,8 @@ "timeoutSeconds": 5, "containerPort": 8080 }, - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -87,4 +80,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresource.json b/pkg/corerp/api/v20231001preview/testdata/containerresource.json index 0775bb97057..4a76b617bd9 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresource.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresource.json @@ -18,9 +18,7 @@ "disableDefaultEnvVars": true, "iam": { "kind": "azure", - "roles": [ - "read" - ] + "roles": ["read"] } } }, @@ -46,13 +44,8 @@ } } }, - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -85,4 +78,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel-manual.json b/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel-manual.json index 1d6b96fc6b1..38a6c7bc29d 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel-manual.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel-manual.json @@ -33,4 +33,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel-runtime.json b/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel-runtime.json index f5757c4b8bb..95ee8b16a16 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel-runtime.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel-runtime.json @@ -28,9 +28,7 @@ "source": "inventory_route_id", "iam": { "kind": "azure", - "roles": [ - "read" - ] + "roles": ["read"] } } }, @@ -52,13 +50,8 @@ "containerPort": 8080 } }, - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "extensions": [ @@ -98,4 +91,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel.json b/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel.json index 9540ae59f0d..958067d8489 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodel.json @@ -28,9 +28,7 @@ "source": "inventory_route_id", "iam": { "kind": "azure", - "roles": [ - "read" - ] + "roles": ["read"] } } }, @@ -63,13 +61,8 @@ } } }, - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "extensions": [ @@ -103,4 +96,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodelemptyext.json b/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodelemptyext.json index 50dd1948dda..4429df50d71 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodelemptyext.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresourcedatamodelemptyext.json @@ -28,9 +28,7 @@ "source": "inventory_route_id", "iam": { "kind": "azure", - "roles": [ - "read" - ] + "roles": ["read"] } } }, @@ -52,13 +50,8 @@ "containerPort": 8080 } }, - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "extensions": [ @@ -82,4 +75,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresourceemptyext.json b/pkg/corerp/api/v20231001preview/testdata/containerresourceemptyext.json index b4fd1c9411b..578df2ce1a9 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresourceemptyext.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresourceemptyext.json @@ -18,9 +18,7 @@ "disableDefaultEnvVars": true, "iam": { "kind": "azure", - "roles": [ - "read" - ] + "roles": ["read"] } } }, @@ -35,13 +33,8 @@ "timeoutSeconds": 5, "containerPort": 8080 }, - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -68,4 +61,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresourceemptyext2.json b/pkg/corerp/api/v20231001preview/testdata/containerresourceemptyext2.json index 37870372a4a..8322ad254b9 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresourceemptyext2.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresourceemptyext2.json @@ -18,9 +18,7 @@ "disableDefaultEnvVars": true, "iam": { "kind": "azure", - "roles": [ - "read" - ] + "roles": ["read"] } } }, @@ -35,13 +33,8 @@ "timeoutSeconds": 5, "containerPort": 8080 }, - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -66,4 +59,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/containerresourcenegativetest.json b/pkg/corerp/api/v20231001preview/testdata/containerresourcenegativetest.json index 2fd62bf9e68..9d6d1bce51a 100644 --- a/pkg/corerp/api/v20231001preview/testdata/containerresourcenegativetest.json +++ b/pkg/corerp/api/v20231001preview/testdata/containerresourcenegativetest.json @@ -17,9 +17,7 @@ "source": "inventory_route_id", "iam": { "kind": "azure", - "roles": [ - "read" - ] + "roles": ["read"] } } }, @@ -37,4 +35,4 @@ "resource": "resourceid" } } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-insecure-registry.json b/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-insecure-registry.json index 8f78c51cc74..bb3a8d1290c 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-insecure-registry.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-insecure-registry.json @@ -1,15 +1,15 @@ { - "templateKind": "bicep", - "templatePath": "br:localhost:8000/recipes/cosmosdb", - "plainHttp": true, - "parameters": { - "throughput": { - "maxValue": 400, - "defaultValue": 200 - }, - "location": { - "type" : "string", - "defaultValue" : "[resourceGroup().location]" - } + "templateKind": "bicep", + "templatePath": "br:localhost:8000/recipes/cosmosdb", + "plainHttp": true, + "parameters": { + "throughput": { + "maxValue": 400, + "defaultValue": 200 + }, + "location": { + "type": "string", + "defaultValue": "[resourceGroup().location]" } - } \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-missingtemplatekind.json b/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-missingtemplatekind.json index 62b803a7a6a..ba569094d55 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-missingtemplatekind.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-missingtemplatekind.json @@ -6,8 +6,8 @@ "defaultValue": 200 }, "location": { - "type" : "string", - "defaultValue" : "[resourceGroup().location]" + "type": "string", + "defaultValue": "[resourceGroup().location]" } } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-terraform.json b/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-terraform.json index d761b3a2c88..415b5980b91 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-terraform.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel-terraform.json @@ -1,15 +1,15 @@ { - "templateKind": "terraform", - "templatePath": "Azure/cosmosdb/azurerm", - "terraformVersion": "1.1.0", - "parameters": { - "throughput": { - "maxValue": 400, - "defaultValue": 200 - }, - "location": { - "type" : "string", - "defaultValue" : "[resourceGroup().location]" - } + "templateKind": "terraform", + "templatePath": "Azure/cosmosdb/azurerm", + "terraformVersion": "1.1.0", + "parameters": { + "throughput": { + "maxValue": 400, + "defaultValue": 200 + }, + "location": { + "type": "string", + "defaultValue": "[resourceGroup().location]" } - } \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel.json b/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel.json index c983da8df91..e35ae205b8f 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentrecipepropertiesdatamodel.json @@ -7,8 +7,8 @@ "defaultValue": 200 }, "location": { - "type" : "string", - "defaultValue" : "[resourceGroup().location]" + "type": "string", + "defaultValue": "[resourceGroup().location]" } } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-missing-namespace.json b/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-missing-namespace.json index 708c1f62948..2843a4cf989 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-missing-namespace.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-missing-namespace.json @@ -1,11 +1,11 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster" } -} \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-namespace.json b/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-namespace.json index e4ccce04623..dbadb74e93a 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-namespace.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-namespace.json @@ -1,12 +1,12 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "radiuslongnamespaceradiuslongnamespaceradiuslongnamespaceradiuslongnamespaceradiuslongnamespaceradiuslongnamespaceradiuslongnamespaceradiuslongnamespace" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "radiuslongnamespaceradiuslongnamespaceradiuslongnamespaceradiuslongnamespaceradiuslongnamespaceradiuslongnamespaceradiuslongnamespaceradiuslongnamespace" } -} \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-resourcetype.json b/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-resourcetype.json index 71e0c25eac8..6739e5212a5 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-resourcetype.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-resourcetype.json @@ -1,28 +1,28 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default" + }, + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" - }, - "aws": { - "scope": "/planes/aws/aws/accounts/140313373712/regions/us-west-2" - } - }, - "recipes": { - "Applications.Dapr/pubsub":{ - "cosmos-recipe": { - "templateKind": "bicep", - "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/pubsub" - } + "aws": { + "scope": "/planes/aws/aws/accounts/140313373712/regions/us-west-2" + } + }, + "recipes": { + "Applications.Dapr/pubsub": { + "cosmos-recipe": { + "templateKind": "bicep", + "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/pubsub" } } } - } \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-templatekind.json b/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-templatekind.json index b5d0953a0c5..38685674343 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-templatekind.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresource-invalid-templatekind.json @@ -1,25 +1,25 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default" - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" - } - }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "cosmos-recipe": { - "templateKind": "helm", - "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/mongo" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default" + }, + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + } + }, + "recipes": { + "Applications.Datastores/mongoDatabases": { + "cosmos-recipe": { + "templateKind": "helm", + "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/mongo" } } } - } \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresource-missing-templatekind.json b/pkg/corerp/api/v20231001preview/testdata/environmentresource-missing-templatekind.json index ab8e503830a..7be03feeea1 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresource-missing-templatekind.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresource-missing-templatekind.json @@ -1,24 +1,24 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default" - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" - } - }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "cosmos-recipe": { - "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/mongo" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default" + }, + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + } + }, + "recipes": { + "Applications.Datastores/mongoDatabases": { + "cosmos-recipe": { + "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/mongo" } } } - } \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresource-terraformrecipe-localpath.json b/pkg/corerp/api/v20231001preview/testdata/environmentresource-terraformrecipe-localpath.json index 145cf4a3c59..ffa52a0daa4 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresource-terraformrecipe-localpath.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresource-terraformrecipe-localpath.json @@ -1,25 +1,25 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default" - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" - } - }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "cosmos-recipe": { - "templateKind": "terraform", - "templatePath": "../not-allowed/" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default" + }, + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + } + }, + "recipes": { + "Applications.Datastores/mongoDatabases": { + "cosmos-recipe": { + "templateKind": "terraform", + "templatePath": "../not-allowed/" } } } - } \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresource-with-simulated-enabled.json b/pkg/corerp/api/v20231001preview/testdata/environmentresource-with-simulated-enabled.json index ae7f8a8ccc3..ae2abc4b561 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresource-with-simulated-enabled.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresource-with-simulated-enabled.json @@ -1,13 +1,13 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default" - }, - "simulated": true - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default" + }, + "simulated": true + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresource-with-workload-identity.json b/pkg/corerp/api/v20231001preview/testdata/environmentresource-with-workload-identity.json index 1d4e2e86037..195420e4a44 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresource-with-workload-identity.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresource-with-workload-identity.json @@ -1,39 +1,39 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default", - "identity": { - "kind": "azure.com.workload", - "resource": "/subscriptions/testSub/resourcegroups/testGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/radius-mi-app", - "oidcIssuer": "https://oidcurl/guid" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default", + "identity": { + "kind": "azure.com.workload", + "resource": "/subscriptions/testSub/resourcegroups/testGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/radius-mi-app", + "oidcIssuer": "https://oidcurl/guid" + } + }, + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + } + }, + "recipeConfig": { + "terraform": { + "authentication": { + "git": {} }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" - } - }, - "recipeConfig": { - "terraform": { - "authentication": { - "git": {} - }, - "providers": {} - }, - "env": {} - }, - "recipes": { - "Applications.Datastores/mongoDatabases": { - "cosmos-recipe": { - "templateKind": "bicep", - "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb" - } - } + "providers": {} + }, + "env": {} + }, + "recipes": { + "Applications.Datastores/mongoDatabases": { + "cosmos-recipe": { + "templateKind": "bicep", + "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb" } + } } -} \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresource.json b/pkg/corerp/api/v20231001preview/testdata/environmentresource.json index 796a6f5bc31..ff73837b888 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresource.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresource.json @@ -110,4 +110,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodel-with-workload-identity.json b/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodel-with-workload-identity.json index e94928f2738..65919e19f60 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodel-with-workload-identity.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodel-with-workload-identity.json @@ -1,52 +1,52 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "compute": { + "kind": "kubernetes", + "kubernetes": { + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default" + }, + "identity": { + "kind": "azure.com.workload", + "resource": "/subscriptions/testSub/resourcegroups/testGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/radius-mi-app", + "oidcIssuer": "https://oidcurl/guid" + } }, - "tags": { - "env": "dev" + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + } }, - "properties": { - "compute": { - "kind": "kubernetes", - "kubernetes": { - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default" - }, - "identity": { - "kind": "azure.com.workload", - "resource": "/subscriptions/testSub/resourcegroups/testGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/radius-mi-app", - "oidcIssuer": "https://oidcurl/guid" - } + "recipeConfig": { + "terraform": { + "authentication": { + "git": {} }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" - } - }, - "recipeConfig": { - "terraform": { - "authentication": { - "git": {} - }, - "providers": {} - }, - "env": {} - }, - "recipes": { - "Applications.Datastores/mongoDatabases": { - "cosmos-recipe": { - "templateKind": "bicep", - "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb" - } - } + "providers": {} + }, + "env": {} + }, + "recipes": { + "Applications.Datastores/mongoDatabases": { + "cosmos-recipe": { + "templateKind": "bicep", + "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb" } + } } -} \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodel.json b/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodel.json index c185bd93b04..4237ed9f57c 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodel.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodel.json @@ -112,4 +112,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodelemptyext.json b/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodelemptyext.json index 13fc6e48a64..6fd616d39f8 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodelemptyext.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodelemptyext.json @@ -1,53 +1,53 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "compute": { + "kind": "kubernetes", + "kubernetes": { + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default" + } }, - "tags": { - "env": "dev" - }, - "properties": { - "compute": { - "kind": "kubernetes", - "kubernetes": { - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default" - } - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" - }, - "aws": { - "scope": "/planes/aws/aws/accounts/140313373712/regions/us-west-2" - } + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "cosmos-recipe": { - "templateKind": "bicep", - "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb", - "parameters" : { - "throughput": 400 - } + "aws": { + "scope": "/planes/aws/aws/accounts/140313373712/regions/us-west-2" + } + }, + "recipes": { + "Applications.Datastores/mongoDatabases": { + "cosmos-recipe": { + "templateKind": "bicep", + "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb", + "parameters": { + "throughput": 400 } } - }, - "extensions": [ - { - "kind": "kubernetesMetadata", - "kubernetesmetadata": { - "annotations": {}, - "labels": {} - } + } + }, + "extensions": [ + { + "kind": "kubernetesMetadata", + "kubernetesmetadata": { + "annotations": {}, + "labels": {} } - ] - } - } \ No newline at end of file + } + ] + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodelemptytemplatekind.json b/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodelemptytemplatekind.json index 6df2e9860c7..67a0cca7238 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodelemptytemplatekind.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresourcedatamodelemptytemplatekind.json @@ -1,37 +1,37 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "compute": { + "kind": "kubernetes", + "kubernetes": { + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default" + } }, - "tags": { - "env": "dev" + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + } }, - "properties": { - "compute": { - "kind": "kubernetes", - "kubernetes": { - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default" - } - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" - } - }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "cosmos-recipe": { - "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb" - } + "recipes": { + "Applications.Datastores/mongoDatabases": { + "cosmos-recipe": { + "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb" } } } - } \ No newline at end of file + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresourceemptyext.json b/pkg/corerp/api/v20231001preview/testdata/environmentresourceemptyext.json index 9ddd7f53e34..ada6bb4e8fc 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresourceemptyext.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresourceemptyext.json @@ -1,32 +1,32 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default" - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default" + }, + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + } + }, + "recipes": { + "Applications.Datastores/mongoDatabases": { + "cosmos-recipe": { + "templateKind": "bicep", + "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb" } - }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "cosmos-recipe": { - "templateKind": "bicep", - "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb" - } - } - }, - "extensions": [ - { - "kind": "kubernetesMetadata", - "annotations": {}, - "labels": {} - } - ] - } - } \ No newline at end of file + } + }, + "extensions": [ + { + "kind": "kubernetesMetadata", + "annotations": {}, + "labels": {} + } + ] + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/environmentresourceemptyext2.json b/pkg/corerp/api/v20231001preview/testdata/environmentresourceemptyext2.json index 924edce3620..5a76805bd62 100644 --- a/pkg/corerp/api/v20231001preview/testdata/environmentresourceemptyext2.json +++ b/pkg/corerp/api/v20231001preview/testdata/environmentresourceemptyext2.json @@ -1,30 +1,30 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "Applications.Core/environments", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", - "namespace": "default" - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "Applications.Core/environments", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster", + "namespace": "default" + }, + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup" + } + }, + "recipes": { + "Applications.Datastores/mongoDatabases": { + "cosmos-recipe": { + "templateKind": "bicep", + "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb" } - }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "cosmos-recipe": { - "templateKind": "bicep", - "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb" - } - } - }, - "extensions": [ - { - "kind": "kubernetesMetadata" - } - ] - } - } \ No newline at end of file + } + }, + "extensions": [ + { + "kind": "kubernetesMetadata" + } + ] + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/extender_manual.json b/pkg/corerp/api/v20231001preview/testdata/extender_manual.json index d3ebe2bd3c6..d391c3d018a 100644 --- a/pkg/corerp/api/v20231001preview/testdata/extender_manual.json +++ b/pkg/corerp/api/v20231001preview/testdata/extender_manual.json @@ -19,4 +19,4 @@ }, "resourceProvisioning": "manual" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/extender_manual_nosecrets.json b/pkg/corerp/api/v20231001preview/testdata/extender_manual_nosecrets.json index b862fc5a856..9366a035726 100644 --- a/pkg/corerp/api/v20231001preview/testdata/extender_manual_nosecrets.json +++ b/pkg/corerp/api/v20231001preview/testdata/extender_manual_nosecrets.json @@ -1,11 +1,11 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/extenders/extender0", - "name": "extender0", - "type": "Applications.Core/extenders", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "fromNumber": "222-222-2222", - "resourceProvisioning": "manual" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/extenders/extender0", + "name": "extender0", + "type": "Applications.Core/extenders", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "fromNumber": "222-222-2222", + "resourceProvisioning": "manual" + } +} diff --git a/pkg/corerp/api/v20231001preview/testdata/extender_recipe.json b/pkg/corerp/api/v20231001preview/testdata/extender_recipe.json index d90eb5898d2..e617bfca3f1 100644 --- a/pkg/corerp/api/v20231001preview/testdata/extender_recipe.json +++ b/pkg/corerp/api/v20231001preview/testdata/extender_recipe.json @@ -16,4 +16,4 @@ "name": "test-recipe" } } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_manual.json b/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_manual.json index f557f855c1b..654d1ea8a84 100644 --- a/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_manual.json +++ b/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_manual.json @@ -32,4 +32,4 @@ }, "resourceProvisioning": "manual" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_manual_nosecrets.json b/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_manual_nosecrets.json index 171e0394bd2..c2c8f0d822e 100644 --- a/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_manual_nosecrets.json +++ b/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_manual_nosecrets.json @@ -1,24 +1,24 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/extenders/extender0", - "name": "extender0", - "type": "Applications.Core/extenders", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/extenders/extender0", + "name": "extender0", + "type": "Applications.Core/extenders", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "additionalProperties": { + "fromNumber": "222-222-2222" }, - "tags": { - "env": "dev" - }, - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "additionalProperties":{ - "fromNumber": "222-222-2222" - }, - "resourceProvisioning": "manual" - } + "resourceProvisioning": "manual" + } } diff --git a/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_recipe.json b/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_recipe.json index 40d69d4bc18..b8194d503c1 100644 --- a/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_recipe.json +++ b/pkg/corerp/api/v20231001preview/testdata/extenderdatamodel_recipe.json @@ -31,4 +31,4 @@ "name": "test-recipe" } } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/extenderresource-invalid.json b/pkg/corerp/api/v20231001preview/testdata/extenderresource-invalid.json index 617e384ce54..19158fd4e8c 100644 --- a/pkg/corerp/api/v20231001preview/testdata/extenderresource-invalid.json +++ b/pkg/corerp/api/v20231001preview/testdata/extenderresource-invalid.json @@ -1,8 +1,8 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/extenders/extender0", - "name": "extender0", - "type": "Applications.Core/extenders", - "properties": { - "secrets": 12345 - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/extenders/extender0", + "name": "extender0", + "type": "Applications.Core/extenders", + "properties": { + "secrets": 12345 + } } diff --git a/pkg/corerp/api/v20231001preview/testdata/extenderresponseresourcedatamodel.json b/pkg/corerp/api/v20231001preview/testdata/extenderresponseresourcedatamodel.json index 8ac29c54b0c..e8b8e9cbf13 100644 --- a/pkg/corerp/api/v20231001preview/testdata/extenderresponseresourcedatamodel.json +++ b/pkg/corerp/api/v20231001preview/testdata/extenderresponseresourcedatamodel.json @@ -28,4 +28,4 @@ }, "resourceProvisioning": "manual" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-sslpassthrough.json b/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-sslpassthrough.json index 8af0e3ac850..391ba5a7513 100644 --- a/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-sslpassthrough.json +++ b/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-sslpassthrough.json @@ -27,4 +27,4 @@ }, "url": "http://myprefix.myapp.mydomain.com" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-tlstermination-nominprotocolversion.json b/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-tlstermination-nominprotocolversion.json index 86032cb2b35..ea59397b815 100644 --- a/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-tlstermination-nominprotocolversion.json +++ b/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-tlstermination-nominprotocolversion.json @@ -27,4 +27,4 @@ }, "url": "http://myprefix.myapp.mydomain.com" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-tlstermination.json b/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-tlstermination.json index cf140763318..4a4b8704919 100644 --- a/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-tlstermination.json +++ b/pkg/corerp/api/v20231001preview/testdata/gatewayresource-with-tlstermination.json @@ -28,4 +28,4 @@ }, "url": "http://myprefix.myapp.mydomain.com" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/gatewayresource.json b/pkg/corerp/api/v20231001preview/testdata/gatewayresource.json index a0df3dfb357..e1a006861ba 100644 --- a/pkg/corerp/api/v20231001preview/testdata/gatewayresource.json +++ b/pkg/corerp/api/v20231001preview/testdata/gatewayresource.json @@ -24,4 +24,4 @@ ], "url": "http://myprefix.myapp.mydomain.com" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-enablewebsockets.json b/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-enablewebsockets.json index 7a993f21eb2..6fdf96a526b 100644 --- a/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-enablewebsockets.json +++ b/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-enablewebsockets.json @@ -39,4 +39,4 @@ }, "url": "http://myprefix.myapp.mydomain.com" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-sslpassthrough.json b/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-sslpassthrough.json index 92249ee132b..870075aff7c 100644 --- a/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-sslpassthrough.json +++ b/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-sslpassthrough.json @@ -38,4 +38,4 @@ }, "url": "http://myprefix.myapp.mydomain.com" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-tlstermination-nominprotocolversion.json b/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-tlstermination-nominprotocolversion.json index 93f1a34d0bc..1fc230d7a8d 100644 --- a/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-tlstermination-nominprotocolversion.json +++ b/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-tlstermination-nominprotocolversion.json @@ -38,4 +38,4 @@ }, "url": "http://myprefix.myapp.mydomain.com" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-tlstermination.json b/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-tlstermination.json index b0d1aedfc38..91f27c0573a 100644 --- a/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-tlstermination.json +++ b/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel-with-tlstermination.json @@ -39,4 +39,4 @@ }, "url": "http://myprefix.myapp.mydomain.com" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel.json b/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel.json index 255a6366f6c..e664ca3ede6 100644 --- a/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel.json +++ b/pkg/corerp/api/v20231001preview/testdata/gatewayresourcedatamodel.json @@ -35,4 +35,4 @@ ], "url": "http://myprefix.myapp.mydomain.com" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/reciperesource.json b/pkg/corerp/api/v20231001preview/testdata/reciperesource.json index ee608ee6dbc..5cf45dcd31d 100644 --- a/pkg/corerp/api/v20231001preview/testdata/reciperesource.json +++ b/pkg/corerp/api/v20231001preview/testdata/reciperesource.json @@ -1,4 +1,4 @@ { - "resourceType":"Applications.Datastores/mongoDatabases", - "name":"mongo-azure" -} \ No newline at end of file + "resourceType": "Applications.Datastores/mongoDatabases", + "name": "mongo-azure" +} diff --git a/pkg/corerp/api/v20231001preview/testdata/secretstore-datamodel-resource.json b/pkg/corerp/api/v20231001preview/testdata/secretstore-datamodel-resource.json index d0dc865d13e..761e87612f7 100644 --- a/pkg/corerp/api/v20231001preview/testdata/secretstore-datamodel-resource.json +++ b/pkg/corerp/api/v20231001preview/testdata/secretstore-datamodel-resource.json @@ -40,4 +40,4 @@ "tags": { "env": "dev" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/secretstore-datamodel.json b/pkg/corerp/api/v20231001preview/testdata/secretstore-datamodel.json index 549ea8ab322..19a6e2eaede 100644 --- a/pkg/corerp/api/v20231001preview/testdata/secretstore-datamodel.json +++ b/pkg/corerp/api/v20231001preview/testdata/secretstore-datamodel.json @@ -35,4 +35,4 @@ "tags": { "env": "dev" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/secretstore-versioned-resource.json b/pkg/corerp/api/v20231001preview/testdata/secretstore-versioned-resource.json index c1a99b3eb56..77e8df35096 100644 --- a/pkg/corerp/api/v20231001preview/testdata/secretstore-versioned-resource.json +++ b/pkg/corerp/api/v20231001preview/testdata/secretstore-versioned-resource.json @@ -32,4 +32,4 @@ "tags": { "env": "dev" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/secretstore-versioned.json b/pkg/corerp/api/v20231001preview/testdata/secretstore-versioned.json index 563a4c203f5..554925b4d77 100644 --- a/pkg/corerp/api/v20231001preview/testdata/secretstore-versioned.json +++ b/pkg/corerp/api/v20231001preview/testdata/secretstore-versioned.json @@ -26,4 +26,4 @@ "tags": { "env": "dev" } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/volume-az-kv-datamodel.json b/pkg/corerp/api/v20231001preview/testdata/volume-az-kv-datamodel.json index 5c68dbf9c3e..1679a381eb6 100644 --- a/pkg/corerp/api/v20231001preview/testdata/volume-az-kv-datamodel.json +++ b/pkg/corerp/api/v20231001preview/testdata/volume-az-kv-datamodel.json @@ -65,4 +65,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/corerp/api/v20231001preview/testdata/volume-az-kv.json b/pkg/corerp/api/v20231001preview/testdata/volume-az-kv.json index e8e09a86519..7d3878c1189 100644 --- a/pkg/corerp/api/v20231001preview/testdata/volume-az-kv.json +++ b/pkg/corerp/api/v20231001preview/testdata/volume-az-kv.json @@ -1,66 +1,66 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/volumes/azkeyvault0", - "name": "azkeyvault0", - "type": "Applications.Core/volumes", - "location": "global", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/volumes/azkeyvault0", + "name": "azkeyvault0", + "type": "Applications.Core/volumes", + "location": "global", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "status": { + "outputResources": [ + { + "id": "/planes/test/local/providers/Test.Namespace/testResources/test-resource" + } + ] }, - "tags": { - "env": "dev" + "provisioningState": "Succeeded", + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/app0", + "resource": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.KeyVault/vaults/vault0", + "kind": "azure.com.keyvault", + "secrets": { + "mysecret-1": { + "name": "mysecret-1", + "alias": "aliassecret-1", + "version": "1", + "encoding": "utf-8" + }, + "mysecret-2": { + "name": "mysecret-2", + "encoding": "base64" + } }, - "properties": { - "status": { - "outputResources": [ - { - "id": "/planes/test/local/providers/Test.Namespace/testResources/test-resource" - } - ] - }, - "provisioningState": "Succeeded", - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "resource": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.KeyVault/vaults/vault0", - "kind": "azure.com.keyvault", - "secrets": { - "mysecret-1": { - "name": "mysecret-1", - "alias": "aliassecret-1", - "version": "1", - "encoding": "utf-8" - }, - "mysecret-2": { - "name": "mysecret-2", - "encoding": "base64" - } - }, - "keys": { - "mykey-1": { - "name": "key1", - "alias": "aliaskey1-1", - "version": "1" - }, - "mykey-2": { - "name": "key2" - } - }, - "certificates": { - "mycert-1": { - "name": "cert1", - "alias": "aliascert1-1", - "certType": "certificate", - "encoding": "utf-8" - }, - "mycert-2": { - "name": "cert2", - "certType": "privatekey", - "format": "pfx", - "encoding": "hex" - } - } + "keys": { + "mykey-1": { + "name": "key1", + "alias": "aliaskey1-1", + "version": "1" + }, + "mykey-2": { + "name": "key2" + } + }, + "certificates": { + "mycert-1": { + "name": "cert1", + "alias": "aliascert1-1", + "certType": "certificate", + "encoding": "utf-8" + }, + "mycert-2": { + "name": "cert2", + "certType": "privatekey", + "format": "pfx", + "encoding": "hex" + } } -} \ No newline at end of file + } +} diff --git a/pkg/corerp/backend/deployment/testdata/containerresourcedatamodel.json b/pkg/corerp/backend/deployment/testdata/containerresourcedatamodel.json index f5e830d3537..a76981fe069 100644 --- a/pkg/corerp/backend/deployment/testdata/containerresourcedatamodel.json +++ b/pkg/corerp/backend/deployment/testdata/containerresourcedatamodel.json @@ -28,9 +28,7 @@ "source": "inventory_route_id", "iam": { "kind": "Http", - "roles": [ - "administrator" - ] + "roles": ["administrator"] } } }, @@ -54,4 +52,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/corerp/backend/deployment/testdata/containerresourcedatamodellowercase.json b/pkg/corerp/backend/deployment/testdata/containerresourcedatamodellowercase.json index 613bb441f93..28559f7df74 100644 --- a/pkg/corerp/backend/deployment/testdata/containerresourcedatamodellowercase.json +++ b/pkg/corerp/backend/deployment/testdata/containerresourcedatamodellowercase.json @@ -28,9 +28,7 @@ "source": "inventory_route_id", "iam": { "kind": "Http", - "roles": [ - "administrator" - ] + "roles": ["administrator"] } } }, @@ -54,4 +52,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/corerp/backend/deployment/testdata/containerresourcedatamodeluppercase.json b/pkg/corerp/backend/deployment/testdata/containerresourcedatamodeluppercase.json index 56d11ef9624..ddf98590faa 100644 --- a/pkg/corerp/backend/deployment/testdata/containerresourcedatamodeluppercase.json +++ b/pkg/corerp/backend/deployment/testdata/containerresourcedatamodeluppercase.json @@ -28,9 +28,7 @@ "source": "inventory_route_id", "iam": { "kind": "Http", - "roles": [ - "administrator" - ] + "roles": ["administrator"] } } }, @@ -54,4 +52,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_datamodel.json b/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_datamodel.json index d039409f594..360baffe211 100644 --- a/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_datamodel.json +++ b/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_datamodel.json @@ -1,40 +1,40 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/applications/app0", - "name": "app0", - "type": "applications.core/applications", - "location": "West US", - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "fake@hotmail.com", - "createdByType": "User", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "fake@hotmail.com", - "lastModifiedByType": "User" - }, - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", - "extensions": [ - { - "kind": "kubernetesNamespace", - "kubernetesNamespace": { - "namespace": "app0-ns" - } - } - ], - "status": { - "compute": { - "kind": "kubernetes", - "kubernetes": { - "resourceId": "", - "namespace": "app0-ns" - } - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/applications/app0", + "name": "app0", + "type": "applications.core/applications", + "location": "West US", + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "fake@hotmail.com", + "createdByType": "User", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "fake@hotmail.com", + "lastModifiedByType": "User" + }, + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", + "extensions": [ + { + "kind": "kubernetesNamespace", + "kubernetesNamespace": { + "namespace": "app0-ns" } - }, - "provisioningState": "Succeeded", - "tenantId": "00000000-0000-0000-0000-000000000000", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "radius-test-rg", - "createdApiVersion": "2023-10-01-preview", - "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file + } + ], + "status": { + "compute": { + "kind": "kubernetes", + "kubernetes": { + "resourceId": "", + "namespace": "app0-ns" + } + } + } + }, + "provisioningState": "Succeeded", + "tenantId": "00000000-0000-0000-0000-000000000000", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "radius-test-rg", + "createdApiVersion": "2023-10-01-preview", + "updatedApiVersion": "2023-10-01-preview" +} diff --git a/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_input.json b/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_input.json index 834c7437fe6..3dfc369e40c 100644 --- a/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_input.json +++ b/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_input.json @@ -1,13 +1,13 @@ { - "location": "West US", - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", - "provisioningState": "Succeeded", - "extensions": [ - { - "kind": "kubernetesNamespace", - "namespace": "app0-ns" - } - ] - } -} \ No newline at end of file + "location": "West US", + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", + "provisioningState": "Succeeded", + "extensions": [ + { + "kind": "kubernetesNamespace", + "namespace": "app0-ns" + } + ] + } +} diff --git a/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_input_diff_env.json b/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_input_diff_env.json index 7251687dcf2..9136d8912cb 100644 --- a/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_input_diff_env.json +++ b/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_input_diff_env.json @@ -1,7 +1,7 @@ { - "location": "West US", - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/invalid", - "provisioningState": "Succeeded" - } -} \ No newline at end of file + "location": "West US", + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/invalid", + "provisioningState": "Succeeded" + } +} diff --git a/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_output.json b/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_output.json index efbfccd3ddc..6e637fdfb6b 100644 --- a/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_output.json +++ b/pkg/corerp/frontend/controller/applications/testdata/application20231001preview_output.json @@ -1,31 +1,31 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/applications/app0", - "location": "West US", - "name": "app0", - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", - "provisioningState": "Succeeded", - "extensions": [ - { - "kind": "kubernetesNamespace", - "namespace": "app0-ns" - } - ], - "status": { - "compute": { - "kind": "kubernetes", - "namespace": "app0-ns" - } - } - }, - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "fake@hotmail.com", - "createdByType": "User", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "fake@hotmail.com", - "lastModifiedByType": "User" - }, - "tags": {}, - "type": "applications.core/applications" -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/applications/app0", + "location": "West US", + "name": "app0", + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", + "provisioningState": "Succeeded", + "extensions": [ + { + "kind": "kubernetesNamespace", + "namespace": "app0-ns" + } + ], + "status": { + "compute": { + "kind": "kubernetes", + "namespace": "app0-ns" + } + } + }, + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "fake@hotmail.com", + "createdByType": "User", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "fake@hotmail.com", + "lastModifiedByType": "User" + }, + "tags": {}, + "type": "applications.core/applications" +} diff --git a/pkg/corerp/frontend/controller/applications/testdata/graph-app-directroute-in.json b/pkg/corerp/frontend/controller/applications/testdata/graph-app-directroute-in.json index 0c86907ac9e..f4a7bd75c5c 100644 --- a/pkg/corerp/frontend/controller/applications/testdata/graph-app-directroute-in.json +++ b/pkg/corerp/frontend/controller/applications/testdata/graph-app-directroute-in.json @@ -1,45 +1,45 @@ [ - { - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend", - "name": "frontend", - "properties": { - "application": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/Applications/myapp", - "connections": { - "sql": { - "source": "http://backendapp:8080" - } - }, - "provisioningState": "Succeeded", - "status": { - "outputResources": { - "id": "/some/thing/else", - "localId": "something" - } - } - }, - "type": "Applications.Core/containers" + { + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend", + "name": "frontend", + "properties": { + "application": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/Applications/myapp", + "connections": { + "sql": { + "source": "http://backendapp:8080" + } + }, + "provisioningState": "Succeeded", + "status": { + "outputResources": { + "id": "/some/thing/else", + "localId": "something" + } + } }, - { - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp", - "name": "backendapp", - "properties": { - "application": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/Applications/myapp", - "container": { - "ports": { - "web": { - "port": 8080, - "protocol": "TCP" - } - } - }, - "provisioningState": "Succeeded", - "status": { - "outputResources": { - "id": "/some/thing/else", - "localId": "something" - } - } - }, - "type": "Applications.Core/containers" - } + "type": "Applications.Core/containers" + }, + { + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp", + "name": "backendapp", + "properties": { + "application": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/Applications/myapp", + "container": { + "ports": { + "web": { + "port": 8080, + "protocol": "TCP" + } + } + }, + "provisioningState": "Succeeded", + "status": { + "outputResources": { + "id": "/some/thing/else", + "localId": "something" + } + } + }, + "type": "Applications.Core/containers" + } ] diff --git a/pkg/corerp/frontend/controller/applications/testdata/graph-app-directroute-out.json b/pkg/corerp/frontend/controller/applications/testdata/graph-app-directroute-out.json index 4875d003afa..f75d3000354 100644 --- a/pkg/corerp/frontend/controller/applications/testdata/graph-app-directroute-out.json +++ b/pkg/corerp/frontend/controller/applications/testdata/graph-app-directroute-out.json @@ -1,28 +1,28 @@ [ - { - "connections": [ - { - "direction": "Outbound", - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp" - } - ], - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend", - "name": "frontend", - "outputResources": [], - "provisioningState": "Succeeded", - "type": "Applications.Core/containers" - }, - { - "connections": [ - { - "direction": "Inbound", - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend" - } - ], - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp", - "name": "backendapp", - "outputResources": [], - "provisioningState": "Succeeded", - "type": "Applications.Core/containers" - } + { + "connections": [ + { + "direction": "Outbound", + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp" + } + ], + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend", + "name": "frontend", + "outputResources": [], + "provisioningState": "Succeeded", + "type": "Applications.Core/containers" + }, + { + "connections": [ + { + "direction": "Inbound", + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend" + } + ], + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp", + "name": "backendapp", + "outputResources": [], + "provisioningState": "Succeeded", + "type": "Applications.Core/containers" + } ] diff --git a/pkg/corerp/frontend/controller/applications/testdata/graph-app-gw-in.json b/pkg/corerp/frontend/controller/applications/testdata/graph-app-gw-in.json index c19897480f1..57f971b6675 100644 --- a/pkg/corerp/frontend/controller/applications/testdata/graph-app-gw-in.json +++ b/pkg/corerp/frontend/controller/applications/testdata/graph-app-gw-in.json @@ -1,77 +1,77 @@ [ - { - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/gateways/httpgw", - "name": "httpgw", - "properties": { - "application": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/Applications/myapp", - "routes": [ - { - "path": "/", - "destination": "http://frontend:8080" - }, - { - "path": "/backendapi", - "destination": "http://backendapp:8080" - } - ] + { + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/gateways/httpgw", + "name": "httpgw", + "properties": { + "application": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/Applications/myapp", + "routes": [ + { + "path": "/", + "destination": "http://frontend:8080" }, - "type": "Applications.Core/containers" + { + "path": "/backendapi", + "destination": "http://backendapp:8080" + } + ] }, - { - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend", - "name": "frontend", - "properties": { - "application": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/Applications/myapp", - "container": { - "image": "magpie:latest", - "readinessProbe": { - "kind": "httpGet", - "path": "/healthz", - "containerPort": 8080 - }, - "ports": { - "web": { - "port": 8080, - "protocol": "TCP" - } - } - }, - "connections": { - "sql": { - "source": "http://backendapp:8080" - } - }, - "provisioningState": "Succeeded", - "status": { - "outputResources": { - "id": "/some/thing/else", - "localId": "something" - } - } + "type": "Applications.Core/containers" + }, + { + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend", + "name": "frontend", + "properties": { + "application": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/Applications/myapp", + "container": { + "image": "magpie:latest", + "readinessProbe": { + "kind": "httpGet", + "path": "/healthz", + "containerPort": 8080 }, - "type": "Applications.Core/containers" + "ports": { + "web": { + "port": 8080, + "protocol": "TCP" + } + } + }, + "connections": { + "sql": { + "source": "http://backendapp:8080" + } + }, + "provisioningState": "Succeeded", + "status": { + "outputResources": { + "id": "/some/thing/else", + "localId": "something" + } + } }, - { - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp", - "name": "backendapp", - "properties": { - "application": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/Applications/myapp", - "container": { - "ports": { - "web": { - "port": 8080, - "protocol": "TCP" - } - } - }, - "provisioningState": "Succeeded", - "status": { - "outputResources": { - "id": "/some/thing/else", - "localId": "something" - } - } - }, - "type": "Applications.Core/containers" - } + "type": "Applications.Core/containers" + }, + { + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp", + "name": "backendapp", + "properties": { + "application": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/Applications/myapp", + "container": { + "ports": { + "web": { + "port": 8080, + "protocol": "TCP" + } + } + }, + "provisioningState": "Succeeded", + "status": { + "outputResources": { + "id": "/some/thing/else", + "localId": "something" + } + } + }, + "type": "Applications.Core/containers" + } ] diff --git a/pkg/corerp/frontend/controller/applications/testdata/graph-app-gw-out.json b/pkg/corerp/frontend/controller/applications/testdata/graph-app-gw-out.json index 478b64fd784..73ac8001344 100644 --- a/pkg/corerp/frontend/controller/applications/testdata/graph-app-gw-out.json +++ b/pkg/corerp/frontend/controller/applications/testdata/graph-app-gw-out.json @@ -1,53 +1,53 @@ [ - { - "connections": [ - { - "direction": "Outbound", - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp" - }, - { - "direction": "Inbound", - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/gateways/httpgw" - } - ], - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend", - "name": "frontend", - "outputResources": [], - "provisioningState": "Succeeded", - "type": "Applications.Core/containers" - }, - { - "connections": [ - { - "direction": "Inbound", - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend" - }, - { - "direction": "Inbound", - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/gateways/httpgw" - } - ], - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp", - "name": "backendapp", - "outputResources": [], - "provisioningState": "Succeeded", - "type": "Applications.Core/containers" - }, - { - "connections": [ - { - "direction": "Outbound", - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp" - }, - { - "direction": "Outbound", - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend" - } - ], - "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/gateways/httpgw", - "name": "httpgw", - "outputResources": [], - "provisioningState": "Succeeded", - "type": "Applications.Core/gateways" - } -] \ No newline at end of file + { + "connections": [ + { + "direction": "Outbound", + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp" + }, + { + "direction": "Inbound", + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/gateways/httpgw" + } + ], + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend", + "name": "frontend", + "outputResources": [], + "provisioningState": "Succeeded", + "type": "Applications.Core/containers" + }, + { + "connections": [ + { + "direction": "Inbound", + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend" + }, + { + "direction": "Inbound", + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/gateways/httpgw" + } + ], + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp", + "name": "backendapp", + "outputResources": [], + "provisioningState": "Succeeded", + "type": "Applications.Core/containers" + }, + { + "connections": [ + { + "direction": "Outbound", + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/backendapp" + }, + { + "direction": "Outbound", + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/containers/frontend" + } + ], + "id": "/planes/radius/local/resourcegroups/default/providers/Applications.Core/gateways/httpgw", + "name": "httpgw", + "outputResources": [], + "provisioningState": "Succeeded", + "type": "Applications.Core/gateways" + } +] diff --git a/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_datamodel.json b/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_datamodel.json index 1cefabea284..7c143043771 100644 --- a/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_datamodel.json +++ b/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_datamodel.json @@ -25,9 +25,7 @@ "disableDefaultEnvVars": false, "iam": { "kind": "azure", - "roles": [ - "admin" - ] + "roles": ["admin"] } } }, @@ -60,4 +58,4 @@ ] } } -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_input.json b/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_input.json index 1d39f778a0a..14e0c06bf8e 100644 --- a/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_input.json +++ b/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_input.json @@ -1,50 +1,48 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/containers/test-container-0", - "name": "test-container-0", - "type": "applications.core/containers", - "location": "West US", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "radius-test-rg", - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "test@microsoft.com", - "createdByType": "Test", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "test@microsoft.com", - "lastModifiedByType": "Test" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/containers/test-container-0", + "name": "test-container-0", + "type": "applications.core/containers", + "location": "West US", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "radius-test-rg", + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "test@microsoft.com", + "createdByType": "Test", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "test@microsoft.com", + "lastModifiedByType": "Test" + }, + "properties": { + "application": "test-application", + "connections": { + "test-connection": { + "source": "test", + "disableDefaultEnvVars": false, + "iam": { + "kind": "azure", + "roles": ["admin"] + } + } }, - "properties": { - "application": "test-application", - "connections": { - "test-connection": { - "source": "test", - "disableDefaultEnvVars": false, - "iam": { - "kind": "azure", - "roles": [ - "admin" - ] - } - } - }, - "container": { - "image": "test-image", - "env": { - "env-variable-0": "test-env-variable-0", - "env-variable-1": "test-env-variable-1" - }, - "ports": { - "default": { - "containerPort": 80, - "protocol": "http", - "provides": "/" - } - }, - "livenessProbe": { - "containerPort": 8080, - "initialDelaySeconds": 5, - "kind": "tcp" - } + "container": { + "image": "test-image", + "env": { + "env-variable-0": "test-env-variable-0", + "env-variable-1": "test-env-variable-1" + }, + "ports": { + "default": { + "containerPort": 80, + "protocol": "http", + "provides": "/" } + }, + "livenessProbe": { + "containerPort": 8080, + "initialDelaySeconds": 5, + "kind": "tcp" + } } -} \ No newline at end of file + } +} diff --git a/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_input_appid.json b/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_input_appid.json index 3384df5349a..42b7439d24b 100644 --- a/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_input_appid.json +++ b/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_input_appid.json @@ -1,50 +1,48 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/containers/test-container-0", - "name": "test-container-0", - "type": "applications.core/containers", - "location": "West US", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "radius-test-rg", - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "test@microsoft.com", - "createdByType": "Test", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "test@microsoft.com", - "lastModifiedByType": "Test" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/containers/test-container-0", + "name": "test-container-0", + "type": "applications.core/containers", + "location": "West US", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "radius-test-rg", + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "test@microsoft.com", + "createdByType": "Test", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "test@microsoft.com", + "lastModifiedByType": "Test" + }, + "properties": { + "application": "test-applicatio-1", + "connections": { + "test-connection": { + "source": "test", + "disableDefaultEnvVars": false, + "iam": { + "kind": "azure", + "roles": ["admin"] + } + } }, - "properties": { - "application": "test-applicatio-1", - "connections": { - "test-connection": { - "source": "test", - "disableDefaultEnvVars": false, - "iam": { - "kind": "azure", - "roles": [ - "admin" - ] - } - } - }, - "container": { - "image": "test-image", - "env": { - "env-variable-0": "test-env-variable-0", - "env-variable-1": "test-env-variable-1" - }, - "ports": { - "default": { - "containerPort": 80, - "protocol": "http", - "provides": "/" - } - }, - "livenessProbe": { - "containerPort": 8080, - "initialDelaySeconds": 5, - "kind": "tcp" - } + "container": { + "image": "test-image", + "env": { + "env-variable-0": "test-env-variable-0", + "env-variable-1": "test-env-variable-1" + }, + "ports": { + "default": { + "containerPort": 80, + "protocol": "http", + "provides": "/" } + }, + "livenessProbe": { + "containerPort": 8080, + "initialDelaySeconds": 5, + "kind": "tcp" + } } -} \ No newline at end of file + } +} diff --git a/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_output.json b/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_output.json index bc90e95068f..3746c7415bd 100644 --- a/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_output.json +++ b/pkg/corerp/frontend/controller/containers/testdata/container20231001preview_output.json @@ -22,9 +22,7 @@ "disableDefaultEnvVars": false, "iam": { "kind": "azure", - "roles": [ - "admin" - ] + "roles": ["admin"] } } }, @@ -56,4 +54,4 @@ ] } } -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/containers/testdata/requestheaders20231001preview.json b/pkg/corerp/frontend/controller/containers/testdata/requestheaders20231001preview.json index 176c9256877..65654f2e8fb 100644 --- a/pkg/corerp/frontend/controller/containers/testdata/requestheaders20231001preview.json +++ b/pkg/corerp/frontend/controller/containers/testdata/requestheaders20231001preview.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/containers/test-container-0?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/containers/test-container-0?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/containers/test-container-0?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/containers/test-container-0?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_datamodel.json b/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_datamodel.json index 3933174ac49..3e420ffffca 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_datamodel.json +++ b/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_datamodel.json @@ -1,45 +1,45 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", - "name": "env0", - "type": "applications.core/environments", - "location": "West US", - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "fake@hotmail.com", - "createdByType": "User", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "fake@hotmail.com", - "lastModifiedByType": "User" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", + "name": "env0", + "type": "applications.core/environments", + "location": "West US", + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "fake@hotmail.com", + "createdByType": "User", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "fake@hotmail.com", + "lastModifiedByType": "User" + }, + "provisioningState": "Succeeded", + "properties": { + "compute": { + "kind": "kubernetes", + "kubernetes": { + "resourceId": "fakeid", + "namespace": "default" + } }, - "provisioningState": "Succeeded", - "properties": { - "compute": { - "kind": "kubernetes", - "kubernetes": { - "resourceId": "fakeid", - "namespace": "default" - } - }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "mongo-azure": { - "templateKind": "bicep", - "templatePath": "ghcr.io/radius-project/dev/recipes/mongodatabases/azure:1.0", - "parameters": { - "throughput": 400 - } - } - } - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg" - } + "recipes": { + "Applications.Datastores/mongoDatabases": { + "mongo-azure": { + "templateKind": "bicep", + "templatePath": "ghcr.io/radius-project/dev/recipes/mongodatabases/azure:1.0", + "parameters": { + "throughput": 400 + } } + } }, - "tenantId": "00000000-0000-0000-0000-000000000000", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "radius-test-rg", - "createdApiVersion": "2023-10-01-preview", - "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg" + } + } + }, + "tenantId": "00000000-0000-0000-0000-000000000000", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "radius-test-rg", + "createdApiVersion": "2023-10-01-preview", + "updatedApiVersion": "2023-10-01-preview" +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_input.json b/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_input.json index c744156b8a9..2b6c5b3a543 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_input.json +++ b/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_input.json @@ -1,26 +1,26 @@ { - "location": "West US", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "fakeid", - "namespace": "default" - }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "mongo-azure": { - "templateKind": "bicep", - "templatePath": "ghcr.io/radius-project/dev/recipes/mongodatabases/azure:1.0", - "parameters": { - "throughput": 400 - } - } - } - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg" - } + "location": "West US", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "fakeid", + "namespace": "default" + }, + "recipes": { + "Applications.Datastores/mongoDatabases": { + "mongo-azure": { + "templateKind": "bicep", + "templatePath": "ghcr.io/radius-project/dev/recipes/mongodatabases/azure:1.0", + "parameters": { + "throughput": 400 + } } + } + }, + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg" + } } -} \ No newline at end of file + } +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_output.json b/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_output.json index 0d7a9147c03..a92ca56e780 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_output.json +++ b/pkg/corerp/frontend/controller/environments/testdata/environment20231001preview_output.json @@ -1,40 +1,40 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", - "location": "West US", - "name": "env0", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "fakeid", - "namespace": "default" - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg" - } - }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "mongo-azure": { - "templateKind": "bicep", - "templatePath": "ghcr.io/radius-project/dev/recipes/mongodatabases/azure:1.0", - "plainHttp": false, - "parameters": { - "throughput": 400 - } - } - } - }, - "provisioningState": "Succeeded" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", + "location": "West US", + "name": "env0", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "fakeid", + "namespace": "default" }, - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "fake@hotmail.com", - "createdByType": "User", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "fake@hotmail.com", - "lastModifiedByType": "User" + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg" + } }, - "tags": {}, - "type": "applications.core/environments" -} \ No newline at end of file + "recipes": { + "Applications.Datastores/mongoDatabases": { + "mongo-azure": { + "templateKind": "bicep", + "templatePath": "ghcr.io/radius-project/dev/recipes/mongodatabases/azure:1.0", + "plainHttp": false, + "parameters": { + "throughput": 400 + } + } + } + }, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "fake@hotmail.com", + "createdByType": "User", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "fake@hotmail.com", + "lastModifiedByType": "User" + }, + "tags": {}, + "type": "applications.core/environments" +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/environmentgetmetadatanonexistingrecipe20231001preview_input.json b/pkg/corerp/frontend/controller/environments/testdata/environmentgetmetadatanonexistingrecipe20231001preview_input.json index f059c65f109..9bb9509e95e 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/environmentgetmetadatanonexistingrecipe20231001preview_input.json +++ b/pkg/corerp/frontend/controller/environments/testdata/environmentgetmetadatanonexistingrecipe20231001preview_input.json @@ -1,4 +1,4 @@ { - "name":"mongodb", - "resourceType":"Applications.Datastores/mongoDatabases" -} \ No newline at end of file + "name": "mongodb", + "resourceType": "Applications.Datastores/mongoDatabases" +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_datamodel.json b/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_datamodel.json index 2596b128c1a..92ab1a5fdfb 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_datamodel.json +++ b/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_datamodel.json @@ -1,53 +1,53 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", - "name": "env0", - "type": "applications.core/environments", - "location": "West US", - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "fake@hotmail.com", - "createdByType": "User", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "fake@hotmail.com", - "lastModifiedByType": "User" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0", + "name": "env0", + "type": "applications.core/environments", + "location": "West US", + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "fake@hotmail.com", + "createdByType": "User", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "fake@hotmail.com", + "lastModifiedByType": "User" + }, + "provisioningState": "Succeeded", + "properties": { + "compute": { + "kind": "kubernetes", + "kubernetes": { + "resourceId": "fakeid", + "namespace": "default" + } }, - "provisioningState": "Succeeded", - "properties": { - "compute": { - "kind": "kubernetes", - "kubernetes": { - "resourceId": "fakeid", - "namespace": "default" - } + "recipes": { + "Applications.Datastores/mongoDatabases": { + "mongo-parameters": { + "templateKind": "bicep", + "templatePath": "ghcr.io/radius-project/dev/recipes/functionaltest/parameters/mongodatabases/azure:1.0" }, - "recipes": { - "Applications.Datastores/mongoDatabases":{ - "mongo-parameters": { - "templateKind": "bicep", - "templatePath": "ghcr.io/radius-project/dev/recipes/functionaltest/parameters/mongodatabases/azure:1.0" - }, - "mongo-terraform": { - "templateKind":"terraform", - "templatePath": "Azure/cosmosdb/azurerm", - "templateVersion": "1.1.0" - } - }, - "Applications.Datastores/redisCache":{ - "redis": { - "templateKind": "bicep", - "templatePath": "ghcr.io/radius-project/dev/redis:1.0" - } - } - }, - "providers": { - "azure": { - "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg" - } + "mongo-terraform": { + "templateKind": "terraform", + "templatePath": "Azure/cosmosdb/azurerm", + "templateVersion": "1.1.0" + } + }, + "Applications.Datastores/redisCache": { + "redis": { + "templateKind": "bicep", + "templatePath": "ghcr.io/radius-project/dev/redis:1.0" } + } }, - "tenantId": "00000000-0000-0000-0000-000000000000", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "radius-test-rg", - "createdApiVersion": "2023-10-01-preview", - "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file + "providers": { + "azure": { + "scope": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg" + } + } + }, + "tenantId": "00000000-0000-0000-0000-000000000000", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "radius-test-rg", + "createdApiVersion": "2023-10-01-preview", + "updatedApiVersion": "2023-10-01-preview" +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_input.json b/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_input.json index 7b16bdeca85..b3bfc039c31 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_input.json +++ b/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_input.json @@ -1,4 +1,4 @@ { - "name":"mongo-parameters", - "resourceType":"Applications.Datastores/mongoDatabases" -} \ No newline at end of file + "name": "mongo-parameters", + "resourceType": "Applications.Datastores/mongoDatabases" +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_input_terraform.json b/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_input_terraform.json index 5939a0fc83e..20d608889b6 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_input_terraform.json +++ b/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_input_terraform.json @@ -1,4 +1,4 @@ { - "name":"mongo-terraform", - "resourceType":"Applications.Datastores/mongoDatabases" -} \ No newline at end of file + "name": "mongo-terraform", + "resourceType": "Applications.Datastores/mongoDatabases" +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_output.json b/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_output.json index 523d02379e1..9096f2c5f13 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_output.json +++ b/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_output.json @@ -4,14 +4,14 @@ "plainHttp": false, "parameters": { "mongodbName": { - "type" : "string" + "type": "string" }, - "documentdbName": { - "type" : "string" + "documentdbName": { + "type": "string" }, "location": { - "type" : "string", - "defaultValue" : "[resourceGroup().location]" + "type": "string", + "defaultValue": "[resourceGroup().location]" } } -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_output_terraform.json b/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_output_terraform.json index d032b18270b..2172dcca4db 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_output_terraform.json +++ b/pkg/corerp/frontend/controller/environments/testdata/environmentgetrecipemetadata20231001preview_output_terraform.json @@ -1,17 +1,17 @@ { - "templateKind": "terraform", - "templatePath": "Azure/cosmosdb/azurerm", - "templateVersion": "1.1.0", - "parameters": { - "mongodbName": { - "type" : "string" - }, - "documentdbName": { - "type" : "string" - }, - "location": { - "type" : "string", - "defaultValue" : "[resourceGroup().location]" - } + "templateKind": "terraform", + "templatePath": "Azure/cosmosdb/azurerm", + "templateVersion": "1.1.0", + "parameters": { + "mongodbName": { + "type": "string" + }, + "documentdbName": { + "type": "string" + }, + "location": { + "type": "string", + "defaultValue": "[resourceGroup().location]" } - } \ No newline at end of file + } +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/recipedatawithmalformedparameterdetails.json b/pkg/corerp/frontend/controller/environments/testdata/recipedatawithmalformedparameterdetails.json index 3df0acab45d..4a84e1f4e44 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/recipedatawithmalformedparameterdetails.json +++ b/pkg/corerp/frontend/controller/environments/testdata/recipedatawithmalformedparameterdetails.json @@ -1,38 +1,38 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "storageAccountName": { - "type": "string" - }, - "storageAccountType": [ - "Premium_LRS", - "Premium_ZRS", - "Standard_GRS", - "Standard_GZRS", - "Standard_LRS", - "Standard_RAGRS", - "Standard_RAGZRS", - "Standard_ZRS" - ], - "location": { - "type": "string", - "defaultValue": "[resourceGroup().location]", - "metadata": { - "description": "Location for all resources." - } - } + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "storageAccountName": { + "type": "string" }, - "resources": [ - { - "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2022-05-01", - "name": "[parameters('storageAccountName')]", - "location": "[parameters('location')]", - "sku": { - "name": "[parameters('storageAccountType')]" - }, - "kind": "StorageV2" - } - ] -} \ No newline at end of file + "storageAccountType": [ + "Premium_LRS", + "Premium_ZRS", + "Standard_GRS", + "Standard_GZRS", + "Standard_LRS", + "Standard_RAGRS", + "Standard_RAGZRS", + "Standard_ZRS" + ], + "location": { + "type": "string", + "defaultValue": "[resourceGroup().location]", + "metadata": { + "description": "Location for all resources." + } + } + }, + "resources": [ + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "2022-05-01", + "name": "[parameters('storageAccountName')]", + "location": "[parameters('location')]", + "sku": { + "name": "[parameters('storageAccountType')]" + }, + "kind": "StorageV2" + } + ] +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/recipedatawithmalformedparameters.json b/pkg/corerp/frontend/controller/environments/testdata/recipedatawithmalformedparameters.json index 65c67563f22..92f9d5d7281 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/recipedatawithmalformedparameters.json +++ b/pkg/corerp/frontend/controller/environments/testdata/recipedatawithmalformedparameters.json @@ -1,26 +1,26 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": [ - "Premium_LRS", - "Premium_ZRS", - "Standard_GRS", - "Standard_GZRS", - "Standard_LRS", - "Standard_RAGRS", - "Standard_RAGZRS", - "Standard_ZRS" - ], - "resources": [ - { - "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2022-05-01", - "name": "[parameters('mongodbName')]", - "location": "[parameters('location')]", - "sku": { - "name": "[parameters('storageAccountType')]" - }, - "kind": "StorageV2" - } - ] -} \ No newline at end of file + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": [ + "Premium_LRS", + "Premium_ZRS", + "Standard_GRS", + "Standard_GZRS", + "Standard_LRS", + "Standard_RAGRS", + "Standard_RAGZRS", + "Standard_ZRS" + ], + "resources": [ + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "2022-05-01", + "name": "[parameters('mongodbName')]", + "location": "[parameters('location')]", + "sku": { + "name": "[parameters('storageAccountType')]" + }, + "kind": "StorageV2" + } + ] +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/recipedatawithoutparameters.json b/pkg/corerp/frontend/controller/environments/testdata/recipedatawithoutparameters.json index 80d5dbf6cc4..c54481b6b53 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/recipedatawithoutparameters.json +++ b/pkg/corerp/frontend/controller/environments/testdata/recipedatawithoutparameters.json @@ -1,16 +1,16 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - { - "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2022-05-01", - "name": "storageAccount1", - "location": "West US 2", - "sku": { - "name": "Standard_GRS" - }, - "kind": "StorageV2" - } - ] -} \ No newline at end of file + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "resources": [ + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "2022-05-01", + "name": "storageAccount1", + "location": "West US 2", + "sku": { + "name": "Standard_GRS" + }, + "kind": "StorageV2" + } + ] +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/recipedatawithparameters.json b/pkg/corerp/frontend/controller/environments/testdata/recipedatawithparameters.json index f8de4aa9c02..20f1337a038 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/recipedatawithparameters.json +++ b/pkg/corerp/frontend/controller/environments/testdata/recipedatawithparameters.json @@ -1,44 +1,44 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "context": { - "type": "object" - }, - "storageAccountName": { - "type": "string" - }, - "storageAccountType": { - "type": "string", - "allowedValues": [ - "Premium_LRS", - "Premium_ZRS", - "Standard_GRS", - "Standard_GZRS", - "Standard_LRS", - "Standard_RAGRS", - "Standard_RAGZRS", - "Standard_ZRS" - ] - }, - "location": { - "type": "string", - "defaultValue": "[resourceGroup().location]", - "metadata": { - "description": "Location for all resources." - } - } + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "context": { + "type": "object" }, - "resources": [ - { - "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2022-05-01", - "name": "[parameters('storageAccountName')]", - "location": "[parameters('location')]", - "sku": { - "name": "[parameters('storageAccountType')]" - }, - "kind": "StorageV2" - } - ] -} \ No newline at end of file + "storageAccountName": { + "type": "string" + }, + "storageAccountType": { + "type": "string", + "allowedValues": [ + "Premium_LRS", + "Premium_ZRS", + "Standard_GRS", + "Standard_GZRS", + "Standard_LRS", + "Standard_RAGRS", + "Standard_RAGZRS", + "Standard_ZRS" + ] + }, + "location": { + "type": "string", + "defaultValue": "[resourceGroup().location]", + "metadata": { + "description": "Location for all resources." + } + } + }, + "resources": [ + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "2022-05-01", + "name": "[parameters('storageAccountName')]", + "location": "[parameters('location')]", + "sku": { + "name": "[parameters('storageAccountType')]" + }, + "kind": "StorageV2" + } + ] +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/requestheaders20231001preview.json b/pkg/corerp/frontend/controller/environments/testdata/requestheaders20231001preview.json index a308ad7960a..3a7f7e2bce6 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/requestheaders20231001preview.json +++ b/pkg/corerp/frontend/controller/environments/testdata/requestheaders20231001preview.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/requestheadersgetrecipemetadata20231001preview.json b/pkg/corerp/frontend/controller/environments/testdata/requestheadersgetrecipemetadata20231001preview.json index b643e40584f..2325b59a74d 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/requestheadersgetrecipemetadata20231001preview.json +++ b/pkg/corerp/frontend/controller/environments/testdata/requestheadersgetrecipemetadata20231001preview.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0/getmetadata?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0/getmetadata?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0/getmetadata?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0/getmetadata?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/corerp/frontend/controller/environments/testdata/requestheadersgetrecipemetadatanotexisting20231001preview.json b/pkg/corerp/frontend/controller/environments/testdata/requestheadersgetrecipemetadatanotexisting20231001preview.json index ecd28b69458..d08a9232182 100644 --- a/pkg/corerp/frontend/controller/environments/testdata/requestheadersgetrecipemetadatanotexisting20231001preview.json +++ b/pkg/corerp/frontend/controller/environments/testdata/requestheadersgetrecipemetadatanotexisting20231001preview.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0/mongodb/getmetadata?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0/mongodb/getmetadata?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/environments/env0/mongodb/getmetadata?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0/mongodb/getmetadata?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_datamodel.json b/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_datamodel.json index 8909ef50c00..e2a6fcc9e76 100644 --- a/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_datamodel.json +++ b/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_datamodel.json @@ -4,18 +4,18 @@ "type": "applications.core/extenders", "location": "West US", "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "fake@hotmail.com", - "createdByType": "User", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "fake@hotmail.com", - "lastModifiedByType": "User" + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "fake@hotmail.com", + "createdByType": "User", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "fake@hotmail.com", + "lastModifiedByType": "User" }, "properties": { "provisioningState": "Succeeded", "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "additionalProperties":{ + "additionalProperties": { "fromNumber": "222-222-2222" }, "secrets": { @@ -30,8 +30,8 @@ "accountSid": { "value": "sid" }, - "authToken:": { - "value": "token" + "authToken:": { + "value": "token" } }, "resourceProvisioning": "manual", @@ -40,4 +40,4 @@ "resourceGroup": "radius-test-rg", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_input.json b/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_input.json index 42988b83f8a..2454543b830 100644 --- a/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_input.json +++ b/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_input.json @@ -1,13 +1,13 @@ { - "location": "West US", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "fromNumber": "222-222-2222", - "secrets": { - "accountSid": "sid", - "authToken:": "token" - }, - "resourceProvisioning": "manual" - } -} \ No newline at end of file + "location": "West US", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "fromNumber": "222-222-2222", + "secrets": { + "accountSid": "sid", + "authToken:": "token" + }, + "resourceProvisioning": "manual" + } +} diff --git a/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_input_diff_env.json b/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_input_diff_env.json index 51cff92fd16..5dd849f3513 100644 --- a/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_input_diff_env.json +++ b/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_input_diff_env.json @@ -1,13 +1,13 @@ { - "location": "West US", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/invalid", - "fromNumber": "222-222-2222", - "secrets": { - "accountSid": "sid", - "authToken:": "token" - }, - "resourceProvisioning": "manual" - } -} \ No newline at end of file + "location": "West US", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/invalid", + "fromNumber": "222-222-2222", + "secrets": { + "accountSid": "sid", + "authToken:": "token" + }, + "resourceProvisioning": "manual" + } +} diff --git a/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_output.json b/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_output.json index 40b19965395..73127ae3098 100644 --- a/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_output.json +++ b/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_output.json @@ -30,4 +30,4 @@ }, "tags": {}, "type": "applications.core/extenders" -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_requestheaders.json b/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_requestheaders.json index de5f7aba5ff..ef43f2d6ac0 100644 --- a/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_requestheaders.json +++ b/pkg/corerp/frontend/controller/extenders/testdata/20231001preview_requestheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/extenders/extender0?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/extenders/extender0?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.core/extenders/extender0?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/extenders/extender0?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/corerp/frontend/controller/extenders/testdata/20231001previewgetandlist_output.json b/pkg/corerp/frontend/controller/extenders/testdata/20231001previewgetandlist_output.json index d52141f508c..fb0fb1a6b3f 100644 --- a/pkg/corerp/frontend/controller/extenders/testdata/20231001previewgetandlist_output.json +++ b/pkg/corerp/frontend/controller/extenders/testdata/20231001previewgetandlist_output.json @@ -26,4 +26,4 @@ }, "tags": {}, "type": "applications.core/extenders" -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_datamodel.json b/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_datamodel.json index 33732108dff..3642695754e 100644 --- a/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_datamodel.json +++ b/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_datamodel.json @@ -40,4 +40,4 @@ }, "url": "myprefix.myapp.mydomain.com" } -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_input.json b/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_input.json index 1a44192f82c..c2290266829 100644 --- a/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_input.json +++ b/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_input.json @@ -1,22 +1,22 @@ { - "location": "West US", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "hostname": { - "fullyQualifiedHostname": "myapp.mydomain.com", - "prefix": "myprefix" - }, - "routes": [ - { - "destination": "mydestination", - "path": "mypath", - "replacePrefix": "myreplaceprefix" - } - ], - "tls": { - "sslPassthrough": false - }, - "url": "myprefix.myapp.mydomain.com", - "provisioningState": "Succeeded" - } -} \ No newline at end of file + "location": "West US", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/app0", + "hostname": { + "fullyQualifiedHostname": "myapp.mydomain.com", + "prefix": "myprefix" + }, + "routes": [ + { + "destination": "mydestination", + "path": "mypath", + "replacePrefix": "myreplaceprefix" + } + ], + "tls": { + "sslPassthrough": false + }, + "url": "myprefix.myapp.mydomain.com", + "provisioningState": "Succeeded" + } +} diff --git a/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_input_appid.json b/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_input_appid.json index 3dd8bf133cc..4f4b7b186b3 100644 --- a/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_input_appid.json +++ b/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_input_appid.json @@ -1,22 +1,22 @@ { - "location": "West US", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/app1", - "hostname": { - "fullyQualifiedHostname": "myapp.mydomain.com", - "prefix": "myprefix" - }, - "routes": [ - { - "destination": "mydestination", - "path": "mypath", - "replacePrefix": "myreplaceprefix" - } - ], - "tls": { - "sslPassthrough": false - }, - "url": "myprefix.myapp.mydomain.com", - "provisioningState": "Succeeded" - } -} \ No newline at end of file + "location": "West US", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/applications/app1", + "hostname": { + "fullyQualifiedHostname": "myapp.mydomain.com", + "prefix": "myprefix" + }, + "routes": [ + { + "destination": "mydestination", + "path": "mypath", + "replacePrefix": "myreplaceprefix" + } + ], + "tls": { + "sslPassthrough": false + }, + "url": "myprefix.myapp.mydomain.com", + "provisioningState": "Succeeded" + } +} diff --git a/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_output.json b/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_output.json index c7331f640cb..c6297fbf371 100644 --- a/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_output.json +++ b/pkg/corerp/frontend/controller/gateways/testdata/gateway20231001preview_output.json @@ -40,4 +40,4 @@ "url": "myprefix.myapp.mydomain.com", "provisioningState": "Succeeded" } -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/app_datamodel.json b/pkg/corerp/frontend/controller/secretstores/testdata/app_datamodel.json index d32184a8ea7..3a57b73e18c 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/app_datamodel.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/app_datamodel.json @@ -1,40 +1,40 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/applications.core/applications/app0", - "name": "app0", - "type": "applications.core/applications", - "location": "global", - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "fake@hotmail.com", - "createdByType": "User", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "fake@hotmail.com", - "lastModifiedByType": "User" - }, - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/applications.core/environments/env0", - "extensions": [ - { - "kind": "kubernetesNamespace", - "kubernetesNamespace": { - "namespace": "app0-ns" - } - } - ], - "status": { - "compute": { - "kind": "kubernetes", - "kubernetes": { - "resourceId": "", - "namespace": "app0-ns" - } - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/applications.core/applications/app0", + "name": "app0", + "type": "applications.core/applications", + "location": "global", + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "fake@hotmail.com", + "createdByType": "User", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "fake@hotmail.com", + "lastModifiedByType": "User" + }, + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/applications.core/environments/env0", + "extensions": [ + { + "kind": "kubernetesNamespace", + "kubernetesNamespace": { + "namespace": "app0-ns" } - }, - "provisioningState": "Succeeded", - "tenantId": "00000000-0000-0000-0000-000000000000", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "testGroup", - "createdApiVersion": "2023-10-01-preview", - "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file + } + ], + "status": { + "compute": { + "kind": "kubernetes", + "kubernetes": { + "resourceId": "", + "namespace": "app0-ns" + } + } + } + }, + "provisioningState": "Succeeded", + "tenantId": "00000000-0000-0000-0000-000000000000", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "testGroup", + "createdApiVersion": "2023-10-01-preview", + "updatedApiVersion": "2023-10-01-preview" +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/env_datamodel.json b/pkg/corerp/frontend/controller/secretstores/testdata/env_datamodel.json index 475b78cb60c..d1db8144c81 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/env_datamodel.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/env_datamodel.json @@ -1,21 +1,21 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "applications.core/environments", - "location": "global", - "provisioningState": "Succeeded", - "properties": { - "compute": { - "kind": "kubernetes", - "kubernetes": { - "resourceId": "fakeid", - "namespace": "default" - } - } - }, - "tenantId": "00000000-0000-0000-0000-000000000000", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "testGroup", - "createdApiVersion": "2023-10-01-preview", - "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "applications.core/environments", + "location": "global", + "provisioningState": "Succeeded", + "properties": { + "compute": { + "kind": "kubernetes", + "kubernetes": { + "resourceId": "fakeid", + "namespace": "default" + } + } + }, + "tenantId": "00000000-0000-0000-0000-000000000000", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "testGroup", + "createdApiVersion": "2023-10-01-preview", + "updatedApiVersion": "2023-10-01-preview" +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/env_nonk8s_datamodel.json b/pkg/corerp/frontend/controller/secretstores/testdata/env_nonk8s_datamodel.json index da0109a9e81..59dcc388123 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/env_nonk8s_datamodel.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/env_nonk8s_datamodel.json @@ -1,17 +1,17 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "name": "env0", - "type": "applications.core/environments", - "location": "global", - "provisioningState": "Succeeded", - "properties": { - "compute": { - "kind": "non-kubernetes" - } - }, - "tenantId": "00000000-0000-0000-0000-000000000000", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "testGroup", - "createdApiVersion": "2023-10-01-preview", - "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "name": "env0", + "type": "applications.core/environments", + "location": "global", + "provisioningState": "Succeeded", + "properties": { + "compute": { + "kind": "non-kubernetes" + } + }, + "tenantId": "00000000-0000-0000-0000-000000000000", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "testGroup", + "createdApiVersion": "2023-10-01-preview", + "updatedApiVersion": "2023-10-01-preview" +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_awsirsa.json b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_awsirsa.json index eec09c3e9fa..0c9b6bfc28e 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_awsirsa.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_awsirsa.json @@ -26,4 +26,4 @@ "resourceGroup": "testGroup", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_azwi.json b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_azwi.json index a05d157bfc4..d61c82e8496 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_azwi.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_azwi.json @@ -29,4 +29,4 @@ "resourceGroup": "testGroup", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_basicauth.json b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_basicauth.json index 4b4e3f12593..4b6732683aa 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_basicauth.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_basicauth.json @@ -29,4 +29,4 @@ "resourceGroup": "testGroup", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_basicauth_invalid.json b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_basicauth_invalid.json index d0e7585a17d..ecb51c58b0e 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_basicauth_invalid.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_basicauth_invalid.json @@ -26,4 +26,4 @@ "resourceGroup": "testGroup", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_cert_value.json b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_cert_value.json index 21454f86884..952af9e2ee3 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_cert_value.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_cert_value.json @@ -31,4 +31,4 @@ "resourceGroup": "testGroup", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_cert_valuefrom.json b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_cert_valuefrom.json index 68c7a08d408..25d0a6ef106 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_cert_valuefrom.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_cert_valuefrom.json @@ -33,4 +33,4 @@ "resourceGroup": "testGroup", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_generic.json b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_generic.json index 676017aa842..4da8ff6c185 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_generic.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_generic.json @@ -34,4 +34,4 @@ "resourceGroup": "testGroup", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope.json b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope.json index 653916fa62d..9522ce2cc67 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope.json @@ -1,37 +1,37 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/secretStores/secret0", - "name": "secret0", - "type": "applications.core/secretstores", - "location": "global", - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "fake@hotmail.com", - "createdByType": "User", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "fake@hotmail.com", - "lastModifiedByType": "User" - }, - "provisioningState": "Succeeded", - "properties": { - "resource": "test-namespace/secret0", - "type": "generic", - "data": { - "tls.crt": { - "encoding": "raw", - "value": "tls.crt" - }, - "tls.key": { - "encoding": "base64", - "value": "dGxzLmNlcnQK" - }, - "servicePrincipalPassword": { - "value": "10000000-1000-1000-0000-000000000000" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/secretStores/secret0", + "name": "secret0", + "type": "applications.core/secretstores", + "location": "global", + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "fake@hotmail.com", + "createdByType": "User", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "fake@hotmail.com", + "lastModifiedByType": "User" + }, + "provisioningState": "Succeeded", + "properties": { + "resource": "test-namespace/secret0", + "type": "generic", + "data": { + "tls.crt": { + "encoding": "raw", + "value": "tls.crt" + }, + "tls.key": { + "encoding": "base64", + "value": "dGxzLmNlcnQK" + }, + "servicePrincipalPassword": { + "value": "10000000-1000-1000-0000-000000000000" } - }, - "tenantId": "00000000-0000-0000-0000-000000000000", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "testGroup", - "createdApiVersion": "2023-10-01-preview", - "updatedApiVersion": "2023-10-01-preview" - } \ No newline at end of file + } + }, + "tenantId": "00000000-0000-0000-0000-000000000000", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "testGroup", + "createdApiVersion": "2023-10-01-preview", + "updatedApiVersion": "2023-10-01-preview" +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope_empty_resource.json b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope_empty_resource.json index 8cacca13bd4..941787dd035 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope_empty_resource.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope_empty_resource.json @@ -1,36 +1,36 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/secretStores/secret0", - "name": "secret0", - "type": "applications.core/secretstores", - "location": "global", - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "fake@hotmail.com", - "createdByType": "User", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "fake@hotmail.com", - "lastModifiedByType": "User" - }, - "provisioningState": "Succeeded", - "properties": { - "type": "generic", - "data": { - "tls.crt": { - "encoding": "raw", - "value": "tls.crt" - }, - "tls.key": { - "encoding": "base64", - "value": "dGxzLmNlcnQK" - }, - "servicePrincipalPassword": { - "value": "10000000-1000-1000-0000-000000000000" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/secretStores/secret0", + "name": "secret0", + "type": "applications.core/secretstores", + "location": "global", + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "fake@hotmail.com", + "createdByType": "User", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "fake@hotmail.com", + "lastModifiedByType": "User" + }, + "provisioningState": "Succeeded", + "properties": { + "type": "generic", + "data": { + "tls.crt": { + "encoding": "raw", + "value": "tls.crt" + }, + "tls.key": { + "encoding": "base64", + "value": "dGxzLmNlcnQK" + }, + "servicePrincipalPassword": { + "value": "10000000-1000-1000-0000-000000000000" } - }, - "tenantId": "00000000-0000-0000-0000-000000000000", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "testGroup", - "createdApiVersion": "2023-10-01-preview", - "updatedApiVersion": "2023-10-01-preview" - } \ No newline at end of file + } + }, + "tenantId": "00000000-0000-0000-0000-000000000000", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "testGroup", + "createdApiVersion": "2023-10-01-preview", + "updatedApiVersion": "2023-10-01-preview" +} diff --git a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope_invalid_resource.json b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope_invalid_resource.json index 580eaa5d471..6819fbd3663 100644 --- a/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope_invalid_resource.json +++ b/pkg/corerp/frontend/controller/secretstores/testdata/secretstores_datamodel_global_scope_invalid_resource.json @@ -1,37 +1,37 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/secretStores/secret0", - "name": "secret0", - "type": "applications.core/secretstores", - "location": "global", - "systemData": { - "createdAt": "2022-03-22T18:54:52.6857175Z", - "createdBy": "fake@hotmail.com", - "createdByType": "User", - "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", - "lastModifiedBy": "fake@hotmail.com", - "lastModifiedByType": "User" - }, - "provisioningState": "Succeeded", - "properties": { - "resource": "secret0", - "type": "generic", - "data": { - "tls.crt": { - "encoding": "raw", - "value": "tls.crt" - }, - "tls.key": { - "encoding": "base64", - "value": "dGxzLmNlcnQK" - }, - "servicePrincipalPassword": { - "value": "10000000-1000-1000-0000-000000000000" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Applications.Core/secretStores/secret0", + "name": "secret0", + "type": "applications.core/secretstores", + "location": "global", + "systemData": { + "createdAt": "2022-03-22T18:54:52.6857175Z", + "createdBy": "fake@hotmail.com", + "createdByType": "User", + "lastModifiedAt": "2022-03-22T18:57:52.6857175Z", + "lastModifiedBy": "fake@hotmail.com", + "lastModifiedByType": "User" + }, + "provisioningState": "Succeeded", + "properties": { + "resource": "secret0", + "type": "generic", + "data": { + "tls.crt": { + "encoding": "raw", + "value": "tls.crt" + }, + "tls.key": { + "encoding": "base64", + "value": "dGxzLmNlcnQK" + }, + "servicePrincipalPassword": { + "value": "10000000-1000-1000-0000-000000000000" } - }, - "tenantId": "00000000-0000-0000-0000-000000000000", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroup": "testGroup", - "createdApiVersion": "2023-10-01-preview", - "updatedApiVersion": "2023-10-01-preview" - } \ No newline at end of file + } + }, + "tenantId": "00000000-0000-0000-0000-000000000000", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroup": "testGroup", + "createdApiVersion": "2023-10-01-preview", + "updatedApiVersion": "2023-10-01-preview" +} diff --git a/pkg/corerp/renderers/container/testdata/basemanifest-output-addcontainer.json b/pkg/corerp/renderers/container/testdata/basemanifest-output-addcontainer.json index f0daf471928..be1f9fe9d1e 100644 --- a/pkg/corerp/renderers/container/testdata/basemanifest-output-addcontainer.json +++ b/pkg/corerp/renderers/container/testdata/basemanifest-output-addcontainer.json @@ -81,4 +81,4 @@ "strategy": {} }, "status": {} -} \ No newline at end of file +} diff --git a/pkg/corerp/renderers/container/testdata/basemanifest-output-merge.json b/pkg/corerp/renderers/container/testdata/basemanifest-output-merge.json index 99a58e1ce6b..54c7950e91f 100644 --- a/pkg/corerp/renderers/container/testdata/basemanifest-output-merge.json +++ b/pkg/corerp/renderers/container/testdata/basemanifest-output-merge.json @@ -115,4 +115,4 @@ "strategy": {} }, "status": {} -} \ No newline at end of file +} diff --git a/pkg/corerp/renderers/volume/azure/testdata/volume-az-kv-systemassigned.json b/pkg/corerp/renderers/volume/azure/testdata/volume-az-kv-systemassigned.json index 8bf9f974e13..35297e4957c 100644 --- a/pkg/corerp/renderers/volume/azure/testdata/volume-az-kv-systemassigned.json +++ b/pkg/corerp/renderers/volume/azure/testdata/volume-az-kv-systemassigned.json @@ -52,4 +52,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_invalidmanual_resource.json b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_invalidmanual_resource.json index 1ec26efcbe9..e5410179fe8 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_invalidmanual_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_invalidmanual_resource.json @@ -14,4 +14,4 @@ "name": "test-recipe" } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_invalidrecipe_resource.json b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_invalidrecipe_resource.json index 19b8a2e89a9..73581a5d79f 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_invalidrecipe_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_invalidrecipe_resource.json @@ -17,4 +17,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_datamodel.json b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_datamodel.json index 9b9fbc2ca91..4e4b79ec072 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_datamodel.json +++ b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_datamodel.json @@ -42,4 +42,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_generic_datamodel.json b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_generic_datamodel.json index 69ed4748bff..a0d7b4c84bf 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_generic_datamodel.json +++ b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_generic_datamodel.json @@ -38,4 +38,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_resource.json b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_resource.json index 3b81eb67944..9bea99b5c3d 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_manual_resource.json @@ -1,26 +1,26 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/configurationStores/test-dcs", - "name": "test-dcs", - "type": "Applications.Dapr/configurationStores", - "location": "global", - "tags": { - "env": "dev" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/configurationStores/test-dcs", + "name": "test-dcs", + "type": "Applications.Dapr/configurationStores", + "location": "global", + "tags": { + "env": "dev" + }, + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", + "resourceProvisioning": "manual", + "type": "configuration.azure.appconfig", + "version": "v1", + "metadata": { + "foo": { + "value": "bar" + } }, - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", - "resourceProvisioning": "manual", - "type": "configuration.azure.appconfig", - "version": "v1", - "metadata": { - "foo": { - "value": "bar" - } - }, - "resources": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ServiceBus/namespaces/radius-eastus-async" - } - ] - } -} \ No newline at end of file + "resources": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ServiceBus/namespaces/radius-eastus-async" + } + ] + } +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_recipe_datamodel.json b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_recipe_datamodel.json index 0fec759021b..33020e485d2 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_recipe_datamodel.json +++ b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_recipe_datamodel.json @@ -34,4 +34,4 @@ "name": "dcs-recipe" } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_recipe_resource.json b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_recipe_resource.json index 16fcaae0d5e..3ada25f5fe8 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/configurationstore_recipe_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/configurationstore_recipe_resource.json @@ -1,17 +1,17 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/configurationStores/test-dcs", - "name": "test-dcs", - "type": "Applications.Dapr/configurationStores", - "location": "global", - "tags": { - "env": "dev" - }, - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", - "resourceProvisioning": "recipe", - "recipe": { - "name": "dcs-recipe" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/configurationStores/test-dcs", + "name": "test-dcs", + "type": "Applications.Dapr/configurationStores", + "location": "global", + "tags": { + "env": "dev" + }, + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", + "resourceProvisioning": "recipe", + "recipe": { + "name": "dcs-recipe" } -} \ No newline at end of file + } +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_invalidmanual_resource.json b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_invalidmanual_resource.json index 4d6c20018ff..36af98f3f32 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_invalidmanual_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_invalidmanual_resource.json @@ -14,4 +14,4 @@ "name": "test-recipe" } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_invalidrecipe_resource.json b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_invalidrecipe_resource.json index 6f65b15fd8c..620e1fb1c88 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_invalidrecipe_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_invalidrecipe_resource.json @@ -17,4 +17,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_datamodel.json b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_datamodel.json index 65033dfc94d..d9adad5b770 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_datamodel.json +++ b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_datamodel.json @@ -42,4 +42,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_generic_datamodel.json b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_generic_datamodel.json index 764f03e0a5b..44b67f983ae 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_generic_datamodel.json +++ b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_generic_datamodel.json @@ -38,4 +38,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_resource.json b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_resource.json index 7c58598f14a..fac80f8ee6b 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_manual_resource.json @@ -1,26 +1,26 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/pubSubBrokers/test-dpsb", - "name": "test-dpsb", - "type": "Applications.Dapr/pubSubBrokers", - "location": "global", - "tags": { - "env": "dev" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/pubSubBrokers/test-dpsb", + "name": "test-dpsb", + "type": "Applications.Dapr/pubSubBrokers", + "location": "global", + "tags": { + "env": "dev" + }, + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", + "resourceProvisioning": "manual", + "type": "pubsub.azure.servicebus", + "version": "v1", + "metadata": { + "foo": { + "value": "bar" + } }, - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", - "resourceProvisioning": "manual", - "type": "pubsub.azure.servicebus", - "version": "v1", - "metadata": { - "foo": { - "value": "bar" - } - }, - "resources": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ServiceBus/namespaces/radius-eastus-async" - } - ] - } -} \ No newline at end of file + "resources": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ServiceBus/namespaces/radius-eastus-async" + } + ] + } +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_recipe_datamodel.json b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_recipe_datamodel.json index 0e1f1e1192d..6bb7aca0071 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_recipe_datamodel.json +++ b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_recipe_datamodel.json @@ -34,4 +34,4 @@ "name": "dpsb-recipe" } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_recipe_resource.json b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_recipe_resource.json index 05685c793d7..15a118a42ac 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_recipe_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/pubsubbroker_recipe_resource.json @@ -1,17 +1,17 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/pubSubBrokers/test-dpsb", - "name": "test-dpsb", - "type": "Applications.Dapr/pubSubBrokers", - "location": "global", - "tags": { - "env": "dev" - }, - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", - "resourceProvisioning": "recipe", - "recipe": { - "name": "dpsb-recipe" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/pubSubBrokers/test-dpsb", + "name": "test-dpsb", + "type": "Applications.Dapr/pubSubBrokers", + "location": "global", + "tags": { + "env": "dev" + }, + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", + "resourceProvisioning": "recipe", + "recipe": { + "name": "dpsb-recipe" } -} \ No newline at end of file + } +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/secretstore_invalidrecipe_resource.json b/pkg/daprrp/api/v20231001preview/testdata/secretstore_invalidrecipe_resource.json index e551f9bbde4..767d21d12ab 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/secretstore_invalidrecipe_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/secretstore_invalidrecipe_resource.json @@ -1,20 +1,20 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/secretStores/test-dss", - "name": "test-dss", - "type": "Applications.Dapr/secretStores", - "location": "global", - "tags": { - "env": "dev" - }, - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", - "type": "secretstores.kubernetes", - "version": "v1", - "metadata": { - "foo": { - "value": "bar" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/secretStores/test-dss", + "name": "test-dss", + "type": "Applications.Dapr/secretStores", + "location": "global", + "tags": { + "env": "dev" + }, + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", + "type": "secretstores.kubernetes", + "version": "v1", + "metadata": { + "foo": { + "value": "bar" } } - } \ No newline at end of file + } +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/secretstore_invalidvalues_resource.json b/pkg/daprrp/api/v20231001preview/testdata/secretstore_invalidvalues_resource.json index 870c70315d2..bbde35f12bf 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/secretstore_invalidvalues_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/secretstore_invalidvalues_resource.json @@ -1,17 +1,17 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/secretStores/test-ss", - "name": "test-dpsb", - "type": "Applications.Dapr/secretStores", - "location": "global", - "tags": { - "env": "dev" - }, - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", - "resourceProvisioning": "manual", - "recipe": { - "name": "test-recipe" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/secretStores/test-ss", + "name": "test-dpsb", + "type": "Applications.Dapr/secretStores", + "location": "global", + "tags": { + "env": "dev" + }, + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", + "resourceProvisioning": "manual", + "recipe": { + "name": "test-recipe" } - } \ No newline at end of file + } +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/secretstore_manual_resource.json b/pkg/daprrp/api/v20231001preview/testdata/secretstore_manual_resource.json index 196a793898f..b2fb0a4556d 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/secretstore_manual_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/secretstore_manual_resource.json @@ -1,22 +1,22 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/secretStores/test-dss", - "name": "test-dss", - "type": "Applications.Dapr/secretStores", - "location": "global", - "tags": { - "env": "dev" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Dapr/secretStores/test-dss", + "name": "test-dss", + "type": "Applications.Dapr/secretStores", + "location": "global", + "tags": { + "env": "dev" + }, + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", + "kind": "generic", + "type": "secretstores.hashicorp.vault", + "version": "v1", + "metadata": { + "foo": { + "value": "bar" + } }, - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", - "kind": "generic", - "type": "secretstores.hashicorp.vault", - "version": "v1", - "metadata": { - "foo": { - "value": "bar" - } - }, - "resourceProvisioning":"manual" - } + "resourceProvisioning": "manual" + } } diff --git a/pkg/daprrp/api/v20231001preview/testdata/secretstore_manual_resourcedatamodel.json b/pkg/daprrp/api/v20231001preview/testdata/secretstore_manual_resourcedatamodel.json index 25420b24c04..4e1dc078c38 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/secretstore_manual_resourcedatamodel.json +++ b/pkg/daprrp/api/v20231001preview/testdata/secretstore_manual_resourcedatamodel.json @@ -35,4 +35,4 @@ }, "resourceProvisioning": "manual" } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/secretstore_recipe_resource.json b/pkg/daprrp/api/v20231001preview/testdata/secretstore_recipe_resource.json index d478d4161b7..ac3b1aa4996 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/secretstore_recipe_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/secretstore_recipe_resource.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/secretstore_recipe_resourcedatamodel.json b/pkg/daprrp/api/v20231001preview/testdata/secretstore_recipe_resourcedatamodel.json index 7b99fc4cf98..cc068b17080 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/secretstore_recipe_resourcedatamodel.json +++ b/pkg/daprrp/api/v20231001preview/testdata/secretstore_recipe_resourcedatamodel.json @@ -43,4 +43,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/statestore_invalidrecipe_resource.json b/pkg/daprrp/api/v20231001preview/testdata/statestore_invalidrecipe_resource.json index 4bd97c928b7..b23fdf0dc7e 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/statestore_invalidrecipe_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/statestore_invalidrecipe_resource.json @@ -17,4 +17,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/statestore_invalidvalues_resource.json b/pkg/daprrp/api/v20231001preview/testdata/statestore_invalidvalues_resource.json index d5931d92186..541907f097b 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/statestore_invalidvalues_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/statestore_invalidvalues_resource.json @@ -14,4 +14,4 @@ "name": "test-recipe" } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/statestore_recipe_resource.json b/pkg/daprrp/api/v20231001preview/testdata/statestore_recipe_resource.json index b11583d5acb..5f986cc15f9 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/statestore_recipe_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/statestore_recipe_resource.json @@ -14,4 +14,4 @@ "name": "recipe-test" } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/statestore_recipe_resourcedatamodel.json b/pkg/daprrp/api/v20231001preview/testdata/statestore_recipe_resourcedatamodel.json index ce1be3c3aa2..d74f4546ad5 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/statestore_recipe_resourcedatamodel.json +++ b/pkg/daprrp/api/v20231001preview/testdata/statestore_recipe_resourcedatamodel.json @@ -36,4 +36,4 @@ "name": "recipe-test" } } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/statestore_values_resource.json b/pkg/daprrp/api/v20231001preview/testdata/statestore_values_resource.json index ed8cb2fc197..bf9e97ec988 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/statestore_values_resource.json +++ b/pkg/daprrp/api/v20231001preview/testdata/statestore_values_resource.json @@ -26,4 +26,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/daprrp/api/v20231001preview/testdata/statestore_values_resourcedatamodel.json b/pkg/daprrp/api/v20231001preview/testdata/statestore_values_resourcedatamodel.json index 068af845703..f7838733eef 100644 --- a/pkg/daprrp/api/v20231001preview/testdata/statestore_values_resourcedatamodel.json +++ b/pkg/daprrp/api/v20231001preview/testdata/statestore_values_resourcedatamodel.json @@ -42,4 +42,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-invalid.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-invalid.json index 703f86cc701..4345ba6320c 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-invalid.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-invalid.json @@ -1,9 +1,9 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", - "name": "mongo0", - "type": "Applications.Datastores/mongoDatabases", - "properties": { - "mode": "resource", - "resource": 12345 - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", + "name": "mongo0", + "type": "Applications.Datastores/mongoDatabases", + "properties": { + "mode": "resource", + "resource": 12345 + } } diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-invalidresprovisioning.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-invalidresprovisioning.json index 5c0de9640c9..7acba19d036 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-invalidresprovisioning.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-invalidresprovisioning.json @@ -1,8 +1,8 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", - "name": "mongo0", - "type": "Applications.Datastores/mongoDatabases", - "properties": { - "resourceProvisioning": "invalid" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", + "name": "mongo0", + "type": "Applications.Datastores/mongoDatabases", + "properties": { + "resourceProvisioning": "invalid" + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-missinginputs.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-missinginputs.json index b1da7f65729..c23fbd25610 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-missinginputs.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource-missinginputs.json @@ -1,8 +1,8 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", - "name": "mongo0", - "type": "Applications.Datastores/mongoDatabases", - "properties": { - "resourceProvisioning": "manual" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", + "name": "mongo0", + "type": "Applications.Datastores/mongoDatabases", + "properties": { + "resourceProvisioning": "manual" + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource.json index 3a4c0fc9b6e..30d5f2e39fc 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource.json @@ -22,4 +22,4 @@ "connectionString": "test-connection-string" } } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource2.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource2.json index 7e51ed807eb..9a49ea837fa 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource2.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource2.json @@ -1,18 +1,18 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", - "name": "mongo0", - "type": "Applications.Datastores/mongoDatabases", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "resourceProvisioning": "manual", - "resources": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Microsoft.DocumentDB/databaseAccounts/testAccount/mongodbDatabases/db" - } - ], - "host": "testAccount.mongo.cosmos.azure.com", - "port": 10255, - "database": "test-database" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", + "name": "mongo0", + "type": "Applications.Datastores/mongoDatabases", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "resourceProvisioning": "manual", + "resources": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Microsoft.DocumentDB/databaseAccounts/testAccount/mongodbDatabases/db" + } + ], + "host": "testAccount.mongo.cosmos.azure.com", + "port": 10255, + "database": "test-database" + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource_recipe.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource_recipe.json index 0d57afb8add..be0bf2afedd 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource_recipe.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource_recipe.json @@ -1,18 +1,18 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", - "name": "mongo0", - "type": "Applications.Datastores/mongoDatabases", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "recipe": { - "name": "cosmosdb", - "parameters":{ - "foo":"bar" - } - }, - "resourceProvisioning": "recipe", - "host": "testAccount.mongo.cosmos.azure.com", - "port": 10255 - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", + "name": "mongo0", + "type": "Applications.Datastores/mongoDatabases", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "recipe": { + "name": "cosmosdb", + "parameters": { + "foo": "bar" + } + }, + "resourceProvisioning": "recipe", + "host": "testAccount.mongo.cosmos.azure.com", + "port": 10255 + } } diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource_recipe2.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource_recipe2.json index 2f601898743..add4e06d11f 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource_recipe2.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresource_recipe2.json @@ -1,11 +1,11 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", - "name": "mongo0", - "type": "Applications.Datastores/mongoDatabases", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "host": "mynewhost.com", - "port": 10256 - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", + "name": "mongo0", + "type": "Applications.Datastores/mongoDatabases", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "host": "mynewhost.com", + "port": 10256 + } } diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel.json index c62c159bee6..67ce2d18086 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel.json @@ -33,4 +33,4 @@ "connectionString": "test-connection-string" } } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel2.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel2.json index 2c3fb303d33..063da68c149 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel2.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel2.json @@ -1,25 +1,29 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", - "name": "mongo0", - "type": "Applications.Datastores/mongoDatabases", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" - }, - "tags": { - "env": "dev" - }, - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "resourceProvisioning": "manual", - "resources": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Microsoft.DocumentDB/databaseAccounts/testAccount/mongodbDatabases/db"}], - "host": "testAccount1.mongo.cosmos.azure.com", - "port": 10255, - "database": "test-database" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", + "name": "mongo0", + "type": "Applications.Datastores/mongoDatabases", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "resourceProvisioning": "manual", + "resources": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Microsoft.DocumentDB/databaseAccounts/testAccount/mongodbDatabases/db" + } + ], + "host": "testAccount1.mongo.cosmos.azure.com", + "port": 10255, + "database": "test-database" + } } diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel_recipe.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel_recipe.json index 66904776ebf..19920d86193 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel_recipe.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabaseresourcedatamodel_recipe.json @@ -1,34 +1,34 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", - "name": "mongo0", - "type": "Applications.Datastores/mongoDatabases", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/mongoDatabases/mongo0", + "name": "mongo0", + "type": "Applications.Datastores/mongoDatabases", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "recipe": { + "name": "cosmosdb", + "parameters": { + "foo": "bar" + } }, - "tags": { - "env": "dev" - }, - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "recipe": { - "name": "cosmosdb", - "parameters":{ - "foo":"bar" - } - }, - "host": "testAccount1.mongo.cosmos.azure.com", - "port": 10255, - "status": { - "recipe": { - "templateKind": "bicep", - "templatePath": "br:sampleregistry.azureacr.io/radius/recipes/abc" - } - } + "host": "testAccount1.mongo.cosmos.azure.com", + "port": 10255, + "status": { + "recipe": { + "templateKind": "bicep", + "templatePath": "br:sampleregistry.azureacr.io/radius/recipes/abc" + } } + } } diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabasesecrets.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabasesecrets.json index e3236171ba8..0b5aeb5ae3f 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabasesecrets.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabasesecrets.json @@ -1,4 +1,4 @@ { - "password": "testPassword", - "connectionString": "test-connection-string" + "password": "testPassword", + "connectionString": "test-connection-string" } diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabasesecretsdatamodel.json b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabasesecretsdatamodel.json index e3236171ba8..0b5aeb5ae3f 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabasesecretsdatamodel.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/mongodatabasesecretsdatamodel.json @@ -1,4 +1,4 @@ { - "password": "testPassword", - "connectionString": "test-connection-string" + "password": "testPassword", + "connectionString": "test-connection-string" } diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalid.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalid.json index 19f18fea4d2..70d56fa79fc 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalid.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalid.json @@ -1,8 +1,8 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", - "name": "redis0", - "type": "Applications.Datastores/redisCaches", - "properties": { - "resourceProvisioning": "invalid" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", + "name": "redis0", + "type": "Applications.Datastores/redisCaches", + "properties": { + "resourceProvisioning": "invalid" + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalid2.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalid2.json index 3f1cdc82b6a..3dfef73f125 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalid2.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalid2.json @@ -1,11 +1,11 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", - "name": "redis0", - "type": "Applications.Datastores/redisCaches", - "properties": { - "resourceProvisioning": "manual", - "secrets": { - "password": "password" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", + "name": "redis0", + "type": "Applications.Datastores/redisCaches", + "properties": { + "resourceProvisioning": "manual", + "secrets": { + "password": "password" } -} \ No newline at end of file + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalidinput.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalidinput.json index 4c00e85dd25..9d097e8a0f9 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalidinput.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource-invalidinput.json @@ -1,8 +1,8 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", - "name": "redis0", - "type": "Applications.Datastores/redisCaches", - "properties": { - "host": 12345 - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", + "name": "redis0", + "type": "Applications.Datastores/redisCaches", + "properties": { + "host": 12345 + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_defaultrecipe.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_defaultrecipe.json index 26b06cc2c66..62252792445 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_defaultrecipe.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_defaultrecipe.json @@ -1,9 +1,9 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", - "name": "redis0", - "type": "Applications.Datastores/redisCaches", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", + "name": "redis0", + "type": "Applications.Datastores/redisCaches", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0" + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_manual.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_manual.json index dbb371cddd7..062f7e02ed5 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_manual.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_manual.json @@ -28,4 +28,4 @@ "tls": true, "resourceProvisioning": "manual" } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_manual_noresources.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_manual_noresources.json index 068bcf2db80..f96f49ddebb 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_manual_noresources.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_manual_noresources.json @@ -1,12 +1,12 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", - "name": "redis0", - "type": "Applications.Datastores/redisCaches", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "host": "myrediscache.redis.cache.windows.net", - "port": 10255, - "resourceProvisioning": "manual" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", + "name": "redis0", + "type": "Applications.Datastores/redisCaches", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "host": "myrediscache.redis.cache.windows.net", + "port": 10255, + "resourceProvisioning": "manual" + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_recipe_named.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_recipe_named.json index a84c0c7ea2e..31b3e0ed33d 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_recipe_named.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_recipe_named.json @@ -1,12 +1,12 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", - "name": "redis0", - "type": "Applications.Datastores/redisCaches", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "recipe": { - "name": "redis-test" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", + "name": "redis0", + "type": "Applications.Datastores/redisCaches", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "recipe": { + "name": "redis-test" } -} \ No newline at end of file + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_recipe_overridevalues.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_recipe_overridevalues.json index ffd08618c1e..9a3cb72e2a3 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_recipe_overridevalues.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresource_recipe_overridevalues.json @@ -1,17 +1,17 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", - "name": "redis0", - "type": "Applications.Datastores/redisCaches", - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "recipe": { - "name": "redis-test", - "parameters": { - "port": 6081 - } - }, - "host": "myrediscache.redis.cache.windows.net", - "port": 10255 - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", + "name": "redis0", + "type": "Applications.Datastores/redisCaches", + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "recipe": { + "name": "redis-test", + "parameters": { + "port": 6081 + } + }, + "host": "myrediscache.redis.cache.windows.net", + "port": 10255 + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_manual.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_manual.json index 4fa666fab3c..b500cf67079 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_manual.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_manual.json @@ -27,4 +27,4 @@ "port": 10255, "resourceProvisioning": "manual" } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_manual_resources.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_manual_resources.json index 4343a7f60f2..e0a744e8326 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_manual_resources.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_manual_resources.json @@ -1,30 +1,32 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", - "name": "redis0", - "type": "Applications.Datastores/redisCaches", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" - }, - "tags": { - "env": "dev" - }, - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "resources": [{ - "id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Microsoft.Cache/Redis/testCache" - }, - { - "id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Microsoft.Cache/Redis/testCache1" - }], - "host": "myrediscache.redis.cache.windows.net", - "port": 10255, - "tls": true, - "resourceProvisioning": "manual" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/redisCaches/redis0", + "name": "redis0", + "type": "Applications.Datastores/redisCaches", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "resources": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Microsoft.Cache/Redis/testCache" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Microsoft.Cache/Redis/testCache1" + } + ], + "host": "myrediscache.redis.cache.windows.net", + "port": 10255, + "tls": true, + "resourceProvisioning": "manual" + } } diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_recipe_default.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_recipe_default.json index 9eaa1621215..ba55b6df2c4 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_recipe_default.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_recipe_default.json @@ -24,4 +24,4 @@ "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication" } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_recipe_params.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_recipe_params.json index d299d1b3085..db912aebe05 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_recipe_params.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscacheresourcedatamodel_recipe_params.json @@ -34,4 +34,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscachesecrets.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscachesecrets.json index f5cc81d18ea..7a5413f2cb5 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscachesecrets.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscachesecrets.json @@ -1,5 +1,5 @@ { - "password": "testPassword", - "connectionString": "test-connection-string", - "url": "test-url" -} \ No newline at end of file + "password": "testPassword", + "connectionString": "test-connection-string", + "url": "test-url" +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/rediscachesecretsdatamodel.json b/pkg/datastoresrp/api/v20231001preview/testdata/rediscachesecretsdatamodel.json index f5cc81d18ea..7a5413f2cb5 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/rediscachesecretsdatamodel.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/rediscachesecretsdatamodel.json @@ -1,5 +1,5 @@ { - "password": "testPassword", - "connectionString": "test-connection-string", - "url": "test-url" -} \ No newline at end of file + "password": "testPassword", + "connectionString": "test-connection-string", + "url": "test-url" +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_invalid_properties_resource.json b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_invalid_properties_resource.json index 5b848220329..04706ce51a4 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_invalid_properties_resource.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_invalid_properties_resource.json @@ -1,8 +1,8 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/sqlDatabases/sql0", - "name": "sql0", - "type": "Applications.Datastores/sqlDatabases", - "properties": { - "resourceProvisioning": "manual" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/sqlDatabases/sql0", + "name": "sql0", + "type": "Applications.Datastores/sqlDatabases", + "properties": { + "resourceProvisioning": "manual" + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_invalid_resourceprovisioning_resource.json b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_invalid_resourceprovisioning_resource.json index c9a6eb867c0..cf4f22105c7 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_invalid_resourceprovisioning_resource.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_invalid_resourceprovisioning_resource.json @@ -1,8 +1,8 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/sqlDatabases/sql0", - "name": "sql0", - "type": "Applications.Datastores/sqlDatabases", - "properties": { - "resourceProvisioning": "invalid" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/sqlDatabases/sql0", + "name": "sql0", + "type": "Applications.Datastores/sqlDatabases", + "properties": { + "resourceProvisioning": "invalid" + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_manual_resource.json b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_manual_resource.json index d1789e21772..3224ee7479e 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_manual_resource.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_manual_resource.json @@ -31,4 +31,4 @@ "connectionString": "test-connection-string" } } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_manual_resourcedatamodel.json b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_manual_resourcedatamodel.json index a74ffd97335..116f14848f5 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_manual_resourcedatamodel.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_manual_resourcedatamodel.json @@ -35,4 +35,4 @@ "username": "testUser", "port": 1433 } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_recipe_resource.json b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_recipe_resource.json index ed1f30edfa9..445be101540 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_recipe_resource.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_recipe_resource.json @@ -1,19 +1,19 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/sqlDatabases/sql0", - "name": "sql0", - "type": "Applications.Datastores/sqlDatabases", - "location": "global", - "tags": { - "env": "dev" - }, - "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", - "recipe": { - "name": "sql-test", - "parameters":{ - "foo":"bar" - } - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/sqlDatabases/sql0", + "name": "sql0", + "type": "Applications.Datastores/sqlDatabases", + "location": "global", + "tags": { + "env": "dev" + }, + "properties": { + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", + "recipe": { + "name": "sql-test", + "parameters": { + "foo": "bar" + } } -} \ No newline at end of file + } +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_recipe_resourcedatamodel.json b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_recipe_resourcedatamodel.json index 5270d1b4700..307051a704d 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_recipe_resourcedatamodel.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_recipe_resourcedatamodel.json @@ -40,4 +40,4 @@ "username": "testUser", "port": 1433 } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_secrets_datamodel.json b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_secrets_datamodel.json index 4f05d5885c6..0b5aeb5ae3f 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_secrets_datamodel.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabase_secrets_datamodel.json @@ -1,4 +1,4 @@ { - "password": "testPassword", - "connectionString": "test-connection-string" -} \ No newline at end of file + "password": "testPassword", + "connectionString": "test-connection-string" +} diff --git a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabaseresource-invalid.json b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabaseresource-invalid.json index 1b4819907cc..005acc06adf 100644 --- a/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabaseresource-invalid.json +++ b/pkg/datastoresrp/api/v20231001preview/testdata/sqldatabaseresource-invalid.json @@ -1,9 +1,9 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/sqlDatabases/sql0", - "name": "sql0", - "type": "Applications.Datastores/sqlDatabases", - "properties": { - "database": 12345, - "resourceProvisioning":"manual" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Datastores/sqlDatabases/sql0", + "name": "sql0", + "type": "Applications.Datastores/sqlDatabases", + "properties": { + "database": 12345, + "resourceProvisioning": "manual" + } } diff --git a/pkg/datastoresrp/frontend/controller/mongodatabases/testdata/20231001preview_datamodel.json b/pkg/datastoresrp/frontend/controller/mongodatabases/testdata/20231001preview_datamodel.json index 7e965c4a130..fc1e720c2c3 100644 --- a/pkg/datastoresrp/frontend/controller/mongodatabases/testdata/20231001preview_datamodel.json +++ b/pkg/datastoresrp/frontend/controller/mongodatabases/testdata/20231001preview_datamodel.json @@ -57,4 +57,4 @@ "resourceGroup": "radius-test-rg", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/frontend/controller/mongodatabases/testdata/20231001preview_requestheaders.json b/pkg/datastoresrp/frontend/controller/mongodatabases/testdata/20231001preview_requestheaders.json index 9a9c914864e..d87bae0b1d5 100644 --- a/pkg/datastoresrp/frontend/controller/mongodatabases/testdata/20231001preview_requestheaders.json +++ b/pkg/datastoresrp/frontend/controller/mongodatabases/testdata/20231001preview_requestheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/mongodatabases/mongo0?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/mongodatabase/mongo0?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/mongodatabases/mongo0?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/mongodatabase/mongo0?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/datastoresrp/frontend/controller/rediscaches/testdata/20231001preview_datamodel.json b/pkg/datastoresrp/frontend/controller/rediscaches/testdata/20231001preview_datamodel.json index 040bd419894..948f99c9e5c 100644 --- a/pkg/datastoresrp/frontend/controller/rediscaches/testdata/20231001preview_datamodel.json +++ b/pkg/datastoresrp/frontend/controller/rediscaches/testdata/20231001preview_datamodel.json @@ -55,4 +55,4 @@ "resourceGroup": "radius-test-rg", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/frontend/controller/rediscaches/testdata/20231001preview_requestheaders.json b/pkg/datastoresrp/frontend/controller/rediscaches/testdata/20231001preview_requestheaders.json index aa7b31dab33..7d9c40388cc 100644 --- a/pkg/datastoresrp/frontend/controller/rediscaches/testdata/20231001preview_requestheaders.json +++ b/pkg/datastoresrp/frontend/controller/rediscaches/testdata/20231001preview_requestheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/rediscaches/redis0?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/rediscache/redis0?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/rediscaches/redis0?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/rediscache/redis0?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_datamodel.json b/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_datamodel.json index 000fcf0b71d..541f85cff90 100644 --- a/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_datamodel.json +++ b/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_datamodel.json @@ -56,4 +56,4 @@ "resourceGroup": "radius-test-rg", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_input.json b/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_input.json index 904cf96ea51..fc83536f9d0 100644 --- a/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_input.json +++ b/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_input.json @@ -1,21 +1,21 @@ { "location": "West US", "properties": { - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", - "resources": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Microsoft.Sql/servers/testServer/databases/testDatabase" - } - ], - "database": "testDatabase", - "server": "testAccount1.sql.cosmos.azure.com", - "resourceProvisioning": "manual", - "port": 1433, - "username": "testUser", - "secrets": { - "password": "testPassword", - "connectionString": "Data Source=tcp:testAccount1.sql.cosmos.azure.com,1433;Initial Catalog=testDatabase;User Id=testUser;Password=testPassword;Encrypt=True;TrustServerCertificate=True" + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/testApplication", + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/env0", + "resources": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Microsoft.Sql/servers/testServer/databases/testDatabase" } + ], + "database": "testDatabase", + "server": "testAccount1.sql.cosmos.azure.com", + "resourceProvisioning": "manual", + "port": 1433, + "username": "testUser", + "secrets": { + "password": "testPassword", + "connectionString": "Data Source=tcp:testAccount1.sql.cosmos.azure.com,1433;Initial Catalog=testDatabase;User Id=testUser;Password=testPassword;Encrypt=True;TrustServerCertificate=True" + } } -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_output.json b/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_output.json index acc7a875205..5bed24ebadc 100644 --- a/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_output.json +++ b/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_output.json @@ -34,4 +34,4 @@ }, "tags": {}, "type": "applications.datastores/sqldatabases" -} \ No newline at end of file +} diff --git a/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_requestheaders.json b/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_requestheaders.json index b8d04e25906..89b16ce39ba 100644 --- a/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_requestheaders.json +++ b/pkg/datastoresrp/frontend/controller/sqldatabases/testdata/20231001preview_requestheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/sqldatabases/sql0?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/sqldatabase/sql0?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/sqldatabases/sql0?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.datastores/sqldatabase/sql0?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_invalid_properties_resource.json b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_invalid_properties_resource.json index aaeb3774221..ad2c096b601 100644 --- a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_invalid_properties_resource.json +++ b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_invalid_properties_resource.json @@ -1,8 +1,8 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Messaging/rabbitMQQueues/rabbitmq0", - "name": "rabbitmq0", - "type": "Applications.Messaging/rabbitMQQueues", - "properties": { - "resourceProvisioning": "manual" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Messaging/rabbitMQQueues/rabbitmq0", + "name": "rabbitmq0", + "type": "Applications.Messaging/rabbitMQQueues", + "properties": { + "resourceProvisioning": "manual" + } +} diff --git a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_invalid_resourceprovisioning_resource.json b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_invalid_resourceprovisioning_resource.json index 588ee7947c6..f041eb21a27 100644 --- a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_invalid_resourceprovisioning_resource.json +++ b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_invalid_resourceprovisioning_resource.json @@ -1,8 +1,8 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Messaging/rabbitMQQueues/rabbitmq0", - "name": "rabbitmq0", - "type": "Applications.Messaging/rabbitMQQueues", - "properties": { - "resourceProvisioning": "invalid" - } -} \ No newline at end of file + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Messaging/rabbitMQQueues/rabbitmq0", + "name": "rabbitmq0", + "type": "Applications.Messaging/rabbitMQQueues", + "properties": { + "resourceProvisioning": "invalid" + } +} diff --git a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_manual_datamodel.json b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_manual_datamodel.json index 2f686b78561..20a122cb41e 100644 --- a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_manual_datamodel.json +++ b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_manual_datamodel.json @@ -36,4 +36,4 @@ "password": "password" } } -} \ No newline at end of file +} diff --git a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_manual_resource.json b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_manual_resource.json index 43d473b073e..321067b3486 100644 --- a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_manual_resource.json +++ b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_manual_resource.json @@ -1,24 +1,24 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Messaging/rabbitMQQueues/rabbitmq0", - "name": "rabbitmq0", - "type": "Applications.Messaging/rabbitMQQueues", - "location": "global", - "tags": { - "env": "dev" - }, - "properties": { - "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", - "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", - "resourceProvisioning":"manual", - "queue": "testQueue", - "host": "test-host", - "vHost": "test-vhost", - "port": 5672, - "username": "test-user", - "tls":true, - "secrets": { - "uri": "connection://string", - "password":"password" - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Messaging/rabbitMQQueues/rabbitmq0", + "name": "rabbitmq0", + "type": "Applications.Messaging/rabbitMQQueues", + "location": "global", + "tags": { + "env": "dev" + }, + "properties": { + "environment": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/environments/test-env", + "application": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Core/applications/test-app", + "resourceProvisioning": "manual", + "queue": "testQueue", + "host": "test-host", + "vHost": "test-vhost", + "port": 5672, + "username": "test-user", + "tls": true, + "secrets": { + "uri": "connection://string", + "password": "password" } -} \ No newline at end of file + } +} diff --git a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_recipe_datamodel.json b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_recipe_datamodel.json index 9154cfb360c..805d06ed9e0 100644 --- a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_recipe_datamodel.json +++ b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_recipe_datamodel.json @@ -42,4 +42,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_recipe_resource.json b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_recipe_resource.json index 0e33a9e71d5..d6a5227c752 100644 --- a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_recipe_resource.json +++ b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmq_recipe_resource.json @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqresource-invalid.json b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqresource-invalid.json index fc7b7297cff..67080b72b8b 100644 --- a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqresource-invalid.json +++ b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqresource-invalid.json @@ -1,8 +1,8 @@ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Messaging/rabbitMQQueues/rabbitmq0", - "name": "rabbitmq0", - "type": "Applications.Messaging/rabbitMQQueues", - "properties": { - "queue": 12345 - } + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Messaging/rabbitMQQueues/rabbitmq0", + "name": "rabbitmq0", + "type": "Applications.Messaging/rabbitMQQueues", + "properties": { + "queue": 12345 + } } diff --git a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqsecrets.json b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqsecrets.json index e6ce6e7aa7c..560c2464fa4 100644 --- a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqsecrets.json +++ b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqsecrets.json @@ -1,4 +1,4 @@ { - "uri": "test-connection-string", - "password": "test-password" -} \ No newline at end of file + "uri": "test-connection-string", + "password": "test-password" +} diff --git a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqsecretsdatamodel.json b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqsecretsdatamodel.json index e6ce6e7aa7c..560c2464fa4 100644 --- a/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqsecretsdatamodel.json +++ b/pkg/messagingrp/api/v20231001preview/testdata/rabbitmqsecretsdatamodel.json @@ -1,4 +1,4 @@ { - "uri": "test-connection-string", - "password": "test-password" -} \ No newline at end of file + "uri": "test-connection-string", + "password": "test-password" +} diff --git a/pkg/messagingrp/frontend/controller/rabbitmqqueues/testdata/20231001preview_datamodel.json b/pkg/messagingrp/frontend/controller/rabbitmqqueues/testdata/20231001preview_datamodel.json index 9fe756f67cd..8a9b7ce2e46 100644 --- a/pkg/messagingrp/frontend/controller/rabbitmqqueues/testdata/20231001preview_datamodel.json +++ b/pkg/messagingrp/frontend/controller/rabbitmqqueues/testdata/20231001preview_datamodel.json @@ -45,4 +45,4 @@ "resourceGroup": "radius-test-rg", "createdApiVersion": "2023-10-01-preview", "updatedApiVersion": "2023-10-01-preview" -} \ No newline at end of file +} diff --git a/pkg/messagingrp/frontend/controller/rabbitmqqueues/testdata/20231001preview_requestheaders.json b/pkg/messagingrp/frontend/controller/rabbitmqqueues/testdata/20231001preview_requestheaders.json index e4bd3fed38b..cb76a4e7ad8 100644 --- a/pkg/messagingrp/frontend/controller/rabbitmqqueues/testdata/20231001preview_requestheaders.json +++ b/pkg/messagingrp/frontend/controller/rabbitmqqueues/testdata/20231001preview_requestheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.messaging/rabbitmqqueues/rabbitmq0?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Messaging/rabbitmqqueue/rabbitmq0?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "https://radapp.io/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/applications.messaging/rabbitmqqueues/rabbitmq0?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "https://radapp.io:443/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/radius-test-rg/providers/Applications.Messaging/rabbitmqqueue/rabbitmq0?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:57:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/recipes/terraform/config/testdata/module-emptyparams.tf.json b/pkg/recipes/terraform/config/testdata/module-emptyparams.tf.json index b538245b1ca..447eaca32e3 100644 --- a/pkg/recipes/terraform/config/testdata/module-emptyparams.tf.json +++ b/pkg/recipes/terraform/config/testdata/module-emptyparams.tf.json @@ -6,4 +6,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/module-emptyresourceparam.tf.json b/pkg/recipes/terraform/config/testdata/module-emptyresourceparam.tf.json index 32000ed76e0..f47f8cdb2be 100644 --- a/pkg/recipes/terraform/config/testdata/module-emptyresourceparam.tf.json +++ b/pkg/recipes/terraform/config/testdata/module-emptyresourceparam.tf.json @@ -8,4 +8,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/module-emptytemplateversion.tf.json b/pkg/recipes/terraform/config/testdata/module-emptytemplateversion.tf.json index d6fa4ff02b0..6c56c1315ca 100644 --- a/pkg/recipes/terraform/config/testdata/module-emptytemplateversion.tf.json +++ b/pkg/recipes/terraform/config/testdata/module-emptytemplateversion.tf.json @@ -8,4 +8,4 @@ "source": "Azure/redis/azurerm" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/module-private-git-repo.tf.json b/pkg/recipes/terraform/config/testdata/module-private-git-repo.tf.json index 2f006e57cad..be9ec356e56 100644 --- a/pkg/recipes/terraform/config/testdata/module-private-git-repo.tf.json +++ b/pkg/recipes/terraform/config/testdata/module-private-git-repo.tf.json @@ -8,4 +8,4 @@ "source": "git::https://env-app-redis-dev.azure.com/project/module" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/module.tf.json b/pkg/recipes/terraform/config/testdata/module.tf.json index 0bdaac75284..834b4e78905 100644 --- a/pkg/recipes/terraform/config/testdata/module.tf.json +++ b/pkg/recipes/terraform/config/testdata/module.tf.json @@ -9,4 +9,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/outputs.tf.json b/pkg/recipes/terraform/config/testdata/outputs.tf.json index 3f08577cb6f..913539013f7 100644 --- a/pkg/recipes/terraform/config/testdata/outputs.tf.json +++ b/pkg/recipes/terraform/config/testdata/outputs.tf.json @@ -15,4 +15,4 @@ "value": "${module.redis-azure.result}" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-empty.tf.json b/pkg/recipes/terraform/config/testdata/providers-empty.tf.json index 046b03381a3..f62bed94840 100644 --- a/pkg/recipes/terraform/config/testdata/providers-empty.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-empty.tf.json @@ -17,4 +17,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-emptyazureconfig.tf.json b/pkg/recipes/terraform/config/testdata/providers-emptyazureconfig.tf.json index 21da0f9e495..0af5b2c53a0 100644 --- a/pkg/recipes/terraform/config/testdata/providers-emptyazureconfig.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-emptyazureconfig.tf.json @@ -30,4 +30,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-emptywithrequiredprovider.tf.json b/pkg/recipes/terraform/config/testdata/providers-emptywithrequiredprovider.tf.json index 5f9ddb36fc4..362b28264ac 100644 --- a/pkg/recipes/terraform/config/testdata/providers-emptywithrequiredprovider.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-emptywithrequiredprovider.tf.json @@ -20,4 +20,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-envrecipedefaultconfig.tf.json b/pkg/recipes/terraform/config/testdata/providers-envrecipedefaultconfig.tf.json index 88893b5541c..ac89646143a 100644 --- a/pkg/recipes/terraform/config/testdata/providers-envrecipedefaultconfig.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-envrecipedefaultconfig.tf.json @@ -26,4 +26,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-envrecipeproviders.tf.json b/pkg/recipes/terraform/config/testdata/providers-envrecipeproviders.tf.json index 796b3bd5f90..c70eea8d13b 100644 --- a/pkg/recipes/terraform/config/testdata/providers-envrecipeproviders.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-envrecipeproviders.tf.json @@ -30,4 +30,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-modules-aliases.tf.json b/pkg/recipes/terraform/config/testdata/providers-modules-aliases.tf.json index 0307bd9458d..ca9b358773c 100644 --- a/pkg/recipes/terraform/config/testdata/providers-modules-aliases.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-modules-aliases.tf.json @@ -25,4 +25,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-modules-noaliases.tf.json b/pkg/recipes/terraform/config/testdata/providers-modules-noaliases.tf.json index cd0f389cac9..3c3a6fe5dea 100644 --- a/pkg/recipes/terraform/config/testdata/providers-modules-noaliases.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-modules-noaliases.tf.json @@ -17,4 +17,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-modules-subsetaliases.tf.json b/pkg/recipes/terraform/config/testdata/providers-modules-subsetaliases.tf.json index 4fb77f9aa2f..a7885d26887 100644 --- a/pkg/recipes/terraform/config/testdata/providers-modules-subsetaliases.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-modules-subsetaliases.tf.json @@ -20,4 +20,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-modules-unmatchedaliases.tf.json b/pkg/recipes/terraform/config/testdata/providers-modules-unmatchedaliases.tf.json index 4e6ca077918..46eb5351058 100644 --- a/pkg/recipes/terraform/config/testdata/providers-modules-unmatchedaliases.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-modules-unmatchedaliases.tf.json @@ -16,4 +16,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-overrideucpproviderconfig.tf.json b/pkg/recipes/terraform/config/testdata/providers-overrideucpproviderconfig.tf.json index f3bcc76199e..46cc32337f4 100644 --- a/pkg/recipes/terraform/config/testdata/providers-overrideucpproviderconfig.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-overrideucpproviderconfig.tf.json @@ -52,4 +52,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/providers-valid.tf.json b/pkg/recipes/terraform/config/testdata/providers-valid.tf.json index d5be9800c17..01832ede2d9 100644 --- a/pkg/recipes/terraform/config/testdata/providers-valid.tf.json +++ b/pkg/recipes/terraform/config/testdata/providers-valid.tf.json @@ -41,4 +41,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/recipecontext-emptyrecipeparams.tf.json b/pkg/recipes/terraform/config/testdata/recipecontext-emptyrecipeparams.tf.json index aaf7a2774df..5a658f0848c 100644 --- a/pkg/recipes/terraform/config/testdata/recipecontext-emptyrecipeparams.tf.json +++ b/pkg/recipes/terraform/config/testdata/recipecontext-emptyrecipeparams.tf.json @@ -27,4 +27,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/recipes/terraform/config/testdata/recipecontext.tf.json b/pkg/recipes/terraform/config/testdata/recipecontext.tf.json index 244012699d9..d6d88ae73b8 100644 --- a/pkg/recipes/terraform/config/testdata/recipecontext.tf.json +++ b/pkg/recipes/terraform/config/testdata/recipecontext.tf.json @@ -30,4 +30,4 @@ "version": "1.1.0" } } -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/apiversion_datamodel.json b/pkg/ucp/api/v20231001preview/testdata/apiversion_datamodel.json index a27f0e1ba90..d522a0984cb 100644 --- a/pkg/ucp/api/v20231001preview/testdata/apiversion_datamodel.json +++ b/pkg/ucp/api/v20231001preview/testdata/apiversion_datamodel.json @@ -4,4 +4,4 @@ "type": "System.Resources/resourceProviders/resourceTypes/apiVersions", "provisioningState": "Succeeded", "properties": {} -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/apiversion_resource.json b/pkg/ucp/api/v20231001preview/testdata/apiversion_resource.json index b00654c87bd..704a9df342d 100644 --- a/pkg/ucp/api/v20231001preview/testdata/apiversion_resource.json +++ b/pkg/ucp/api/v20231001preview/testdata/apiversion_resource.json @@ -2,4 +2,4 @@ "id": "/planes/radius/local/providers/System.Resources/resourceProviders/Applications.Test/resourceTypes/testResources/apiVersions/2025-01-01", "name": "2025-01-01", "properties": {} -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/awsplane-datamodel-empty.json b/pkg/ucp/api/v20231001preview/testdata/awsplane-datamodel-empty.json index 800fceb81b6..b65bea96f02 100644 --- a/pkg/ucp/api/v20231001preview/testdata/awsplane-datamodel-empty.json +++ b/pkg/ucp/api/v20231001preview/testdata/awsplane-datamodel-empty.json @@ -15,4 +15,4 @@ "env": "dev" }, "properties": {} -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/azureplane-resource-empty.json b/pkg/ucp/api/v20231001preview/testdata/azureplane-resource-empty.json index f4f5ecdc106..ac894957232 100644 --- a/pkg/ucp/api/v20231001preview/testdata/azureplane-resource-empty.json +++ b/pkg/ucp/api/v20231001preview/testdata/azureplane-resource-empty.json @@ -9,4 +9,4 @@ "properties": { "url": "https://management.azure.com" } -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-aws-accesskey.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-aws-accesskey.json index fd0db898a21..16a3b3198ef 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-aws-accesskey.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-aws-accesskey.json @@ -1,17 +1,17 @@ { - "id": "/planes/aws/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "west-us-2", - "tags": { - "env": "dev" - }, - "properties": { - "accessKeyId": "00000000-0000-0000-0000-000000000000", - "secretAccessKey": "00000000-0000-0000-0000-000000000000", - "kind": "AccessKey", - "storage": { - "kind": "Internal" - } + "id": "/planes/aws/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "west-us-2", + "tags": { + "env": "dev" + }, + "properties": { + "accessKeyId": "00000000-0000-0000-0000-000000000000", + "secretAccessKey": "00000000-0000-0000-0000-000000000000", + "kind": "AccessKey", + "storage": { + "kind": "Internal" } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-aws-irsa.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-aws-irsa.json index 421a43d58be..75b21a5122e 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-aws-irsa.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-aws-irsa.json @@ -1,16 +1,16 @@ { - "id": "/planes/aws/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "west-us-2", - "tags": { - "env": "dev" - }, - "properties": { - "roleARN": "arn:aws:iam::000000000000:role/role-name", - "kind": "IRSA", - "storage": { - "kind": "Internal" - } + "id": "/planes/aws/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "west-us-2", + "tags": { + "env": "dev" + }, + "properties": { + "roleARN": "arn:aws:iam::000000000000:role/role-name", + "kind": "IRSA", + "storage": { + "kind": "Internal" } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-azure-serviceprincipal.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-azure-serviceprincipal.json index 57931726892..202b6818c0b 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-azure-serviceprincipal.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-azure-serviceprincipal.json @@ -1,18 +1,18 @@ { - "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", - "name": "default", - "type": "System.Azure/credentials", - "location": "west-us-2", - "tags": { - "env": "dev" - }, - "properties": { - "kind": "ServicePrincipal", - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000", - "clientSecret": "secret", - "storage": { - "kind": "Internal" - } + "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", + "name": "default", + "type": "System.Azure/credentials", + "location": "west-us-2", + "tags": { + "env": "dev" + }, + "properties": { + "kind": "ServicePrincipal", + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000", + "clientSecret": "secret", + "storage": { + "kind": "Internal" } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-azure-workloadidentity.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-azure-workloadidentity.json index 5d6d681a756..f601382a94d 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-azure-workloadidentity.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-azure-workloadidentity.json @@ -1,17 +1,17 @@ { - "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", - "name": "default", - "type": "System.Azure/credentials", - "location": "west-us-2", - "tags": { - "env": "dev" - }, - "properties": { - "kind": "WorkloadIdentity", - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000", - "storage": { - "kind": "Internal" - } + "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", + "name": "default", + "type": "System.Azure/credentials", + "location": "west-us-2", + "tags": { + "env": "dev" + }, + "properties": { + "kind": "WorkloadIdentity", + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000", + "storage": { + "kind": "Internal" } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-properties.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-properties.json index f622bc89301..38e8f98aba9 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-properties.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-properties.json @@ -1,6 +1,6 @@ { - "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", - "name": "default", - "type": "System.Azure/credentials", - "location": "west-us-2" -} \ No newline at end of file + "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", + "name": "default", + "type": "System.Azure/credentials", + "location": "west-us-2" +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-aws.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-aws.json index b48807fd785..46856a9bf58 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-aws.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-aws.json @@ -1,12 +1,12 @@ { - "id": "/planes/aws/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "west-us-2", - "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000", - "clientSecret": "secret", - "kind": "AccessKey" - } -} \ No newline at end of file + "id": "/planes/aws/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "west-us-2", + "properties": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000", + "clientSecret": "secret", + "kind": "AccessKey" + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-azure.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-azure.json index d93935992ec..e18660718ce 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-azure.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-azure.json @@ -1,12 +1,12 @@ { - "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", - "name": "default", - "type": "System.Azure/credentials", - "location": "west-us-2", - "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000", - "clientSecret": "secret", - "kind": "ServicePrincipal" - } + "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", + "name": "default", + "type": "System.Azure/credentials", + "location": "west-us-2", + "properties": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000", + "clientSecret": "secret", + "kind": "ServicePrincipal" + } } diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-kind-aws.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-kind-aws.json index 39bb58d777e..08669c038b3 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-kind-aws.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-kind-aws.json @@ -1,14 +1,13 @@ { - "id": "/planes/aws/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "west-us-2", - "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000", - "clientSecret": "secret", - "kind": "AccessKey", - "storage": { - } - } -} \ No newline at end of file + "id": "/planes/aws/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "west-us-2", + "properties": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000", + "clientSecret": "secret", + "kind": "AccessKey", + "storage": {} + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-kind-azure.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-kind-azure.json index fcf8cfbee75..d478d8df5f5 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-kind-azure.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-empty-storage-kind-azure.json @@ -1,13 +1,13 @@ { - "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", - "name": "default", - "type": "System.Azure/credentials", - "location": "west-us-2", - "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000", - "clientSecret": "secret", - "kind": "ServicePrincipal", - "storage": {} - } -} \ No newline at end of file + "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", + "name": "default", + "type": "System.Azure/credentials", + "location": "west-us-2", + "properties": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000", + "clientSecret": "secret", + "kind": "ServicePrincipal", + "storage": {} + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-invalid-storagekind-aws.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-invalid-storagekind-aws.json index 2fb0b4898cd..7a1e61a382e 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-invalid-storagekind-aws.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-invalid-storagekind-aws.json @@ -1,15 +1,15 @@ { - "id": "/planes/aws/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "west-us-2", - "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000", - "clientSecret": "secret", - "kind": "AccessKey", - "storage": { - "kind": "invalid" - } + "id": "/planes/aws/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "west-us-2", + "properties": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000", + "clientSecret": "secret", + "kind": "AccessKey", + "storage": { + "kind": "invalid" } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-invalid-storagekind-azure.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-invalid-storagekind-azure.json index dce8af6b168..7c70cb993a7 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-invalid-storagekind-azure.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-invalid-storagekind-azure.json @@ -1,15 +1,15 @@ { - "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", - "name": "default", - "type": "System.Azure/credentials", - "location": "west-us-2", - "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000", - "clientSecret": "secret", - "kind": "ServicePrincipal", - "storage": { - "kind": "invalid" - } + "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", + "name": "default", + "type": "System.Azure/credentials", + "location": "west-us-2", + "properties": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000", + "clientSecret": "secret", + "kind": "ServicePrincipal", + "storage": { + "kind": "invalid" } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresource-other.json b/pkg/ucp/api/v20231001preview/testdata/credentialresource-other.json index 9b6c617806e..fff5b690744 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresource-other.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresource-other.json @@ -1,14 +1,14 @@ { - "id": "/planes/other/othercloud/providers/System.Other/credentials/default", - "name": "default", - "type": "System.Other/credentials", - "location": "west-us-2", - "tags": { - "env": "dev" - }, - "properties": { - "storage": { - "kind": "Internal" - } + "id": "/planes/other/othercloud/providers/System.Other/credentials/default", + "name": "default", + "type": "System.Other/credentials", + "location": "west-us-2", + "tags": { + "env": "dev" + }, + "properties": { + "storage": { + "kind": "Internal" } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-aws-accesskey.json b/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-aws-accesskey.json index 7239e894674..538ffc6c686 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-aws-accesskey.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-aws-accesskey.json @@ -1,34 +1,34 @@ { - "id": "/planes/aws/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "west-us-2", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + "id": "/planes/aws/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "west-us-2", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "namespace": "radius-system", + "kind": "AccessKey", + "awsCredential": { + "kind": "AccessKey", + "accesskey": { + "accessKeyId": "00000000-0000-0000-0000-000000000000", + "secretAccessKey": "00000000-0000-0000-0000-000000000000" + } }, - "tags": { - "env": "dev" - }, - "properties": { - "namespace": "radius-system", - "kind": "AccessKey", - "awsCredential": { - "kind": "AccessKey", - "accesskey": { - "accessKeyId": "00000000-0000-0000-0000-000000000000", - "secretAccessKey": "00000000-0000-0000-0000-000000000000" - } - }, - "storage": { - "kind": "Internal", - "internalCredential": { - "secretName": "aws-awscloud-default" - } - } + "storage": { + "kind": "Internal", + "internalCredential": { + "secretName": "aws-awscloud-default" + } } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-aws-irsa.json b/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-aws-irsa.json index 4df034df1a3..8734ec7a043 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-aws-irsa.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-aws-irsa.json @@ -1,33 +1,33 @@ { - "id": "/planes/aws/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "west-us-2", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + "id": "/planes/aws/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "west-us-2", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "namespace": "radius-system", + "kind": "IRSA", + "awsCredential": { + "kind": "IRSA", + "irsa": { + "roleARN": "arn:aws:iam::000000000000:role/role-name" + } }, - "tags": { - "env": "dev" - }, - "properties": { - "namespace": "radius-system", - "kind": "IRSA", - "awsCredential": { - "kind": "IRSA", - "irsa": { - "roleARN": "arn:aws:iam::000000000000:role/role-name" - } - }, - "storage": { - "kind": "Internal", - "internalCredential": { - "secretName": "aws-awscloud-default" - } - } + "storage": { + "kind": "Internal", + "internalCredential": { + "secretName": "aws-awscloud-default" + } } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-azure-serviceprincipal.json b/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-azure-serviceprincipal.json index d597ff9bc58..29537a6a63b 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-azure-serviceprincipal.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-azure-serviceprincipal.json @@ -1,35 +1,35 @@ { - "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", - "name": "default", - "type": "System.Azure/credentials", - "location": "west-us-2", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", + "name": "default", + "type": "System.Azure/credentials", + "location": "west-us-2", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "namespace": "radius-system", + "kind": "ServicePrincipal", + "azureCredential": { + "kind": "ServicePrincipal", + "servicePrincipal": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000", + "secret": "secret" + } }, - "tags": { - "env": "dev" - }, - "properties": { - "namespace": "radius-system", - "kind": "ServicePrincipal", - "azureCredential": { - "kind": "ServicePrincipal", - "servicePrincipal": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000", - "secret": "secret" - } - }, - "storage": { - "kind": "Internal", - "internalCredential": { - "secretName": "azure-azurecloud-default" - } - } + "storage": { + "kind": "Internal", + "internalCredential": { + "secretName": "azure-azurecloud-default" + } } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-azure-workloadidentity.json b/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-azure-workloadidentity.json index bde5380eff8..58e51854e87 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-azure-workloadidentity.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-azure-workloadidentity.json @@ -1,34 +1,34 @@ { - "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", - "name": "default", - "type": "System.Azure/credentials", - "location": "west-us-2", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", + "name": "default", + "type": "System.Azure/credentials", + "location": "west-us-2", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "namespace": "radius-system", + "kind": "WorkloadIdentity", + "azureCredential": { + "kind": "WorkloadIdentity", + "workloadIdentity": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" + } }, - "tags": { - "env": "dev" - }, - "properties": { - "namespace": "radius-system", - "kind": "WorkloadIdentity", - "azureCredential": { - "kind": "WorkloadIdentity", - "workloadIdentity": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000" - } - }, - "storage": { - "kind": "Internal", - "internalCredential": { - "secretName": "azure-azurecloud-default" - } - } + "storage": { + "kind": "Internal", + "internalCredential": { + "secretName": "azure-azurecloud-default" + } } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-default.json b/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-default.json index 0cf4c6ed5b8..81c57478515 100644 --- a/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-default.json +++ b/pkg/ucp/api/v20231001preview/testdata/credentialresourcedatamodel-default.json @@ -1,27 +1,27 @@ { - "id": "/planes/other/othercloud/providers/System.Other/credentials/default", - "name": "default", - "type": "System.Other/credentials", - "location": "west-us-2", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" - }, - "tags": { - "env": "dev" - }, - "properties": { - "namespace": "radius-system", - "kind": "default", - "storage": { - "kind": "Internal", - "internalCredential": { - "secretName": "other_othercloud_default" - } - } + "id": "/planes/other/othercloud/providers/System.Other/credentials/default", + "name": "default", + "type": "System.Other/credentials", + "location": "west-us-2", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "namespace": "radius-system", + "kind": "default", + "storage": { + "kind": "Internal", + "internalCredential": { + "secretName": "other_othercloud_default" + } } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/genericplane-datamodel-empty.json b/pkg/ucp/api/v20231001preview/testdata/genericplane-datamodel-empty.json index 791bb40bce1..b65bea96f02 100644 --- a/pkg/ucp/api/v20231001preview/testdata/genericplane-datamodel-empty.json +++ b/pkg/ucp/api/v20231001preview/testdata/genericplane-datamodel-empty.json @@ -14,6 +14,5 @@ "tags": { "env": "dev" }, - "properties": { - } -} \ No newline at end of file + "properties": {} +} diff --git a/pkg/ucp/api/v20231001preview/testdata/genericresource_datamodel.json b/pkg/ucp/api/v20231001preview/testdata/genericresource_datamodel.json index c8fabfc130e..a3451de302f 100644 --- a/pkg/ucp/api/v20231001preview/testdata/genericresource_datamodel.json +++ b/pkg/ucp/api/v20231001preview/testdata/genericresource_datamodel.json @@ -1,22 +1,22 @@ { - "id": "/planes/radius/local/providers/System.Resources/resources/asdf", - "name": "asdf", - "type": "System.Resources/resources", - "location": "global", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" - }, - "tags": { - "env": "dev" - }, - "properties": { - "id": "/planes/radius/local/resourcegroups/rg1/providers/Applications.Core/applications/test-app", - "type": "Applications.Core/applications", - "name": "test-app" - } -} \ No newline at end of file + "id": "/planes/radius/local/providers/System.Resources/resources/asdf", + "name": "asdf", + "type": "System.Resources/resources", + "location": "global", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "id": "/planes/radius/local/resourcegroups/rg1/providers/Applications.Core/applications/test-app", + "type": "Applications.Core/applications", + "name": "test-app" + } +} diff --git a/pkg/ucp/api/v20231001preview/testdata/location_datamodel.json b/pkg/ucp/api/v20231001preview/testdata/location_datamodel.json index 7554ec45767..ca274ef12b5 100644 --- a/pkg/ucp/api/v20231001preview/testdata/location_datamodel.json +++ b/pkg/ucp/api/v20231001preview/testdata/location_datamodel.json @@ -13,4 +13,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/location_resource.json b/pkg/ucp/api/v20231001preview/testdata/location_resource.json index 49b318f3640..5984bcf7540 100644 --- a/pkg/ucp/api/v20231001preview/testdata/location_resource.json +++ b/pkg/ucp/api/v20231001preview/testdata/location_resource.json @@ -11,4 +11,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/planeresource-empty-resourceproviders.json b/pkg/ucp/api/v20231001preview/testdata/planeresource-empty-resourceproviders.json index c3d3785f9f2..aacbcd54707 100644 --- a/pkg/ucp/api/v20231001preview/testdata/planeresource-empty-resourceproviders.json +++ b/pkg/ucp/api/v20231001preview/testdata/planeresource-empty-resourceproviders.json @@ -1,10 +1,9 @@ { - "id": "/planes/radius/local", - "name": "local", - "type": "System.Radius/planes", - "properties": { - "kind": "UCPNative", - "resourceProviders": { - } - } + "id": "/planes/radius/local", + "name": "local", + "type": "System.Radius/planes", + "properties": { + "kind": "UCPNative", + "resourceProviders": {} + } } diff --git a/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-missing-kind.json b/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-missing-kind.json index c33f07e8199..b24077ce336 100644 --- a/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-missing-kind.json +++ b/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-missing-kind.json @@ -1,10 +1,10 @@ { - "id": "/planes/radius/local", - "name": "local", - "type": "System.Radius/planes", - "properties": { - "resourceProviders": { - "Applications.Core": "https://applications.core.radius.azure.com" - } + "id": "/planes/radius/local", + "name": "local", + "type": "System.Radius/planes", + "properties": { + "resourceProviders": { + "Applications.Core": "https://applications.core.radius.azure.com" } + } } diff --git a/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-missing-url.json b/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-missing-url.json index 8ef058e1cb1..0e67a6b6b82 100644 --- a/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-missing-url.json +++ b/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-missing-url.json @@ -1,11 +1,11 @@ { - "id": "/planes/radius/local", - "name": "local", - "type": "System.Radius/planes", - "properties": { - "kind": "Azure", - "resourceProviders": { - "Applications.Core": "https://applications.core.radius.azure.com" - } + "id": "/planes/radius/local", + "name": "local", + "type": "System.Radius/planes", + "properties": { + "kind": "Azure", + "resourceProviders": { + "Applications.Core": "https://applications.core.radius.azure.com" } + } } diff --git a/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-unsupported-kind.json b/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-unsupported-kind.json index 7ef50e8616b..13ba03b17ae 100644 --- a/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-unsupported-kind.json +++ b/pkg/ucp/api/v20231001preview/testdata/planeresource-invalid-unsupported-kind.json @@ -1,11 +1,11 @@ { - "id": "/planes/radius/local", - "name": "local", - "type": "System.Radius/planes", - "properties": { - "kind": "BadKind", - "resourceProviders": { - "Applications.Core": "https://applications.core.radius.azure.com" - } + "id": "/planes/radius/local", + "name": "local", + "type": "System.Radius/planes", + "properties": { + "kind": "BadKind", + "resourceProviders": { + "Applications.Core": "https://applications.core.radius.azure.com" } + } } diff --git a/pkg/ucp/api/v20231001preview/testdata/planeresource.json b/pkg/ucp/api/v20231001preview/testdata/planeresource.json index cfd01424ceb..3f0d1b80d9f 100644 --- a/pkg/ucp/api/v20231001preview/testdata/planeresource.json +++ b/pkg/ucp/api/v20231001preview/testdata/planeresource.json @@ -1,11 +1,11 @@ { - "id": "/planes/radius/local", - "name": "local", - "type": "System.Radius/planes", - "properties": { - "kind": "UCPNative", - "resourceProviders": { - "Applications.Core": "https://applications.core.radius.azure.com" - } + "id": "/planes/radius/local", + "name": "local", + "type": "System.Radius/planes", + "properties": { + "kind": "UCPNative", + "resourceProviders": { + "Applications.Core": "https://applications.core.radius.azure.com" } + } } diff --git a/pkg/ucp/api/v20231001preview/testdata/planeresourcedatamodel.json b/pkg/ucp/api/v20231001preview/testdata/planeresourcedatamodel.json index 0aa72367b5e..fa47bbb42c6 100644 --- a/pkg/ucp/api/v20231001preview/testdata/planeresourcedatamodel.json +++ b/pkg/ucp/api/v20231001preview/testdata/planeresourcedatamodel.json @@ -1,22 +1,22 @@ { - "id": "/planes/radius/local", - "name": "local", - "type": "System.Radius/planes", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" - }, - "tags": { - "env": "dev" - }, - "properties": { - "kind": "UCPNative", - "resourceProviders": { - "Applications.Core": "https://applications.core.radius.azure.com" - } + "id": "/planes/radius/local", + "name": "local", + "type": "System.Radius/planes", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + }, + "properties": { + "kind": "UCPNative", + "resourceProviders": { + "Applications.Core": "https://applications.core.radius.azure.com" } + } } diff --git a/pkg/ucp/api/v20231001preview/testdata/radiusplane-datamodel-empty.json b/pkg/ucp/api/v20231001preview/testdata/radiusplane-datamodel-empty.json index 31629a9c081..0658820d232 100644 --- a/pkg/ucp/api/v20231001preview/testdata/radiusplane-datamodel-empty.json +++ b/pkg/ucp/api/v20231001preview/testdata/radiusplane-datamodel-empty.json @@ -19,4 +19,4 @@ "Applications.Core": "http://applications-rp:9000" } } -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/resourcegroup.json b/pkg/ucp/api/v20231001preview/testdata/resourcegroup.json index 59f0f6c7924..cbd9f3d45c2 100644 --- a/pkg/ucp/api/v20231001preview/testdata/resourcegroup.json +++ b/pkg/ucp/api/v20231001preview/testdata/resourcegroup.json @@ -1,9 +1,9 @@ { - "id": "/planes/radius/local/resourceGroups/test-rg", - "name": "test-rg", - "type": "System.Resources/resourceGroups", - "location": "global", - "tags": { - "env": "dev" - } + "id": "/planes/radius/local/resourceGroups/test-rg", + "name": "test-rg", + "type": "System.Resources/resourceGroups", + "location": "global", + "tags": { + "env": "dev" + } } diff --git a/pkg/ucp/api/v20231001preview/testdata/resourcegroupresourcedatamodel.json b/pkg/ucp/api/v20231001preview/testdata/resourcegroupresourcedatamodel.json index c91d7e8495b..86fb5af8161 100644 --- a/pkg/ucp/api/v20231001preview/testdata/resourcegroupresourcedatamodel.json +++ b/pkg/ucp/api/v20231001preview/testdata/resourcegroupresourcedatamodel.json @@ -1,17 +1,17 @@ { - "id": "/planes/radius/local/resourceGroups/test-rg", - "name": "test-rg", - "type": "System.Resources/resourceGroups", - "location": "global", - "systemData": { - "createdBy": "fakeid@live.com", - "createdByType": "User", - "createdAt": "2021-09-24T19:09:54.2403864Z", - "lastModifiedBy": "fakeid@live.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" - }, - "tags": { - "env": "dev" - } + "id": "/planes/radius/local/resourceGroups/test-rg", + "name": "test-rg", + "type": "System.Resources/resourceGroups", + "location": "global", + "systemData": { + "createdBy": "fakeid@live.com", + "createdByType": "User", + "createdAt": "2021-09-24T19:09:54.2403864Z", + "lastModifiedBy": "fakeid@live.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-09-24T20:09:54.2403864Z" + }, + "tags": { + "env": "dev" + } } diff --git a/pkg/ucp/api/v20231001preview/testdata/resourceprovider_datamodel.json b/pkg/ucp/api/v20231001preview/testdata/resourceprovider_datamodel.json index 7fa9b67dce5..a5c8250634d 100644 --- a/pkg/ucp/api/v20231001preview/testdata/resourceprovider_datamodel.json +++ b/pkg/ucp/api/v20231001preview/testdata/resourceprovider_datamodel.json @@ -5,4 +5,4 @@ "location": "global", "provisioningState": "Succeeded", "properties": {} -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/resourceprovider_resource.json b/pkg/ucp/api/v20231001preview/testdata/resourceprovider_resource.json index 1702862764c..ed4598afbbc 100644 --- a/pkg/ucp/api/v20231001preview/testdata/resourceprovider_resource.json +++ b/pkg/ucp/api/v20231001preview/testdata/resourceprovider_resource.json @@ -3,4 +3,4 @@ "name": "Applications.Test", "location": "global", "properties": {} -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/resourceprovidersummary_datamodel.json b/pkg/ucp/api/v20231001preview/testdata/resourceprovidersummary_datamodel.json index c7a17684141..0232263e81b 100644 --- a/pkg/ucp/api/v20231001preview/testdata/resourceprovidersummary_datamodel.json +++ b/pkg/ucp/api/v20231001preview/testdata/resourceprovidersummary_datamodel.json @@ -13,4 +13,4 @@ } } } -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/resourcetype_datamodel.json b/pkg/ucp/api/v20231001preview/testdata/resourcetype_datamodel.json index 0de9332a690..0fc57927334 100644 --- a/pkg/ucp/api/v20231001preview/testdata/resourcetype_datamodel.json +++ b/pkg/ucp/api/v20231001preview/testdata/resourcetype_datamodel.json @@ -6,4 +6,4 @@ "properties": { "defaultApiVersion": "2025-01-01" } -} \ No newline at end of file +} diff --git a/pkg/ucp/api/v20231001preview/testdata/resourcetype_resource.json b/pkg/ucp/api/v20231001preview/testdata/resourcetype_resource.json index 67ca436b08c..240db3dab6d 100644 --- a/pkg/ucp/api/v20231001preview/testdata/resourcetype_resource.json +++ b/pkg/ucp/api/v20231001preview/testdata/resourcetype_resource.json @@ -4,4 +4,4 @@ "properties": { "defaultApiVersion": "2025-01-01" } -} \ No newline at end of file +} diff --git a/pkg/ucp/aws/servicecontext/testdata/armrpcheaders.json b/pkg/ucp/aws/servicecontext/testdata/armrpcheaders.json index 2a8e7c759e5..ce7a87684b1 100644 --- a/pkg/ucp/aws/servicecontext/testdata/armrpcheaders.json +++ b/pkg/ucp/aws/servicecontext/testdata/armrpcheaders.json @@ -1,63 +1,63 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "http://127.0.0.1:9000/apis/api.ucp.dev/v1alpha3/planes/aws/aws/accounts/817312594854/regions/us-west-2/providers/AWS.Kinesis/Stream/:put?api-version=2023-10-01-preview", - "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", - "User-Agent": "ARMClient/1.6.0.0", - "Via": "1.1 Azure", - "X-Azure-Requestchain": "hops=1", - "X-Fd-Clienthttpversion": "1.1", - "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Fd-Edgeenvironment": "fake", - "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", - "X-Fd-Originalurl": "http://127.0.0.1:9000/apis/api.ucp.dev/v1alpha3/planes/aws/aws/accounts/817312594854/regions/us-west-2/providers/AWS.Kinesis/Stream/:put?api-version=2023-10-01-preview", - "X-Fd-Partner": "AzureResourceManager_Test", - "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", - "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", - "X-Fd-Routekey": "000075000", - "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", - "X-Forwarded-For": "192.168.0.10", - "X-Forwarded-Host": "radapp.io", - "X-Forwarded-Port": "443", - "X-Forwarded-Proto": "https", - "X-Forwarded-Scheme": "https", - "X-Ms-Activity-Vector": "IN.0P", - "X-Ms-Arm-Network-Source": "PublicNetwork", - "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:54:52.6857175Z\"}", - "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Acr": "1", - "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", - "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-App-Id-Acr": "0", - "X-Ms-Client-Audience": "https://management.core.windows.net/", - "X-Ms-Client-Authentication-Methods": "pwd", - "X-Ms-Client-Authorization-Source": "RoleBased", - "X-Ms-Client-Family-Name-Encoded": "fake", - "X-Ms-Client-Given-Name-Encoded": "fake", - "X-Ms-Client-Identity-Provider": "live.com", - "X-Ms-Client-Ip-Address": "192.168.0.10", - "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", - "X-Ms-Client-Location": "centralus", - "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Principal-Group-Membership-Source": "Token", - "X-Ms-Client-Principal-Id": "000000000000000", - "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", - "X-Ms-Client-Puid": "000000000000000", - "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Client-Scope": "user_impersonation", - "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", - "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", - "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", - "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", - "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", - "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", - "X-Real-Ip": "192.168.0.10", - "X-Request-Id": "1000f6040000000000004bc7d1666424", - "X-Scheme": "https" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "http://127.0.0.1:9000/apis/api.ucp.dev/v1alpha3/planes/aws/aws/accounts/817312594854/regions/us-west-2/providers/AWS.Kinesis/Stream/:put?api-version=2023-10-01-preview", + "Traceparent": "00-000011048df2134ca37c9a689c3a0000-0000000000000000-01", + "User-Agent": "ARMClient/1.6.0.0", + "Via": "1.1 Azure", + "X-Azure-Requestchain": "hops=1", + "X-Fd-Clienthttpversion": "1.1", + "X-Fd-Clientip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Fd-Edgeenvironment": "fake", + "X-Fd-Eventid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Impressionguid": "00005A12DDEC4F8B80B65BB768190000", + "X-Fd-Originalurl": "http://127.0.0.1:9000/apis/api.ucp.dev/v1alpha3/planes/aws/aws/accounts/817312594854/regions/us-west-2/providers/AWS.Kinesis/Stream/:put?api-version=2023-10-01-preview", + "X-Fd-Partner": "AzureResourceManager_Test", + "X-Fd-Ref": "Ref A: xxxx Ref B: xxxx Ref C: 2022-03-22T18:54:50Z", + "X-Fd-Revip": "country=United States,iso=us,state=Washington,city=Redmond,zip=00000,tz=-8,asn=0,lat=0,long=-1,countrycf=8,citycf=8", + "X-Fd-Routekey": "000075000", + "X-Fd-Socketip": "0000:0000:0000:1:0000:0000:0000:0000", + "X-Forwarded-For": "192.168.0.10", + "X-Forwarded-Host": "radapp.io", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "X-Forwarded-Scheme": "https", + "X-Ms-Activity-Vector": "IN.0P", + "X-Ms-Arm-Network-Source": "PublicNetwork", + "X-Ms-Arm-Request-Tracking-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Arm-Resource-System-Data": "{\"lastModifiedBy\":\"fake@hotmail.com\",\"lastModifiedByType\":\"User\",\"lastModifiedAt\":\"2022-03-22T18:54:52.6857175Z\"}", + "X-Ms-Arm-Service-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Acr": "1", + "X-Ms-Client-Alt-Sec-Id": "1:live.com:0006000017E40000", + "X-Ms-Client-App-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-App-Id-Acr": "0", + "X-Ms-Client-Audience": "https://management.core.windows.net/", + "X-Ms-Client-Authentication-Methods": "pwd", + "X-Ms-Client-Authorization-Source": "RoleBased", + "X-Ms-Client-Family-Name-Encoded": "fake", + "X-Ms-Client-Given-Name-Encoded": "fake", + "X-Ms-Client-Identity-Provider": "live.com", + "X-Ms-Client-Ip-Address": "192.168.0.10", + "X-Ms-Client-Issuer": "https://sts.windows-ppe.net/00000000-0000-0000-0000-000000000000/", + "X-Ms-Client-Location": "centralus", + "X-Ms-Client-Object-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Principal-Group-Membership-Source": "Token", + "X-Ms-Client-Principal-Id": "000000000000000", + "X-Ms-Client-Principal-Name": "live.com#fake@hotmail.com", + "X-Ms-Client-Puid": "000000000000000", + "X-Ms-Client-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Client-Scope": "user_impersonation", + "X-Ms-Client-Tenant-Id": "00000000-0000-0000-0000-000000000001", + "X-Ms-Client-Wids": "00000000-0000-0000-0000-000000000000, 00000000-0000-0000-0000-000000000001", + "X-Ms-Correlation-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Home-Tenant-Id": "00000000-0000-0000-0000-000000000002", + "X-Ms-Request-Id": "00000000-0000-0000-0000-000000000000", + "X-Ms-Routing-Request-Id": "CENTRALUS:20220322T185452Z:00000000-0000-0000-0000-000000000000", + "X-Original-Forwarded-For": "0000:0000:0000:1:449b:f928:e40a:a351", + "X-Real-Ip": "192.168.0.10", + "X-Request-Id": "1000f6040000000000004bc7d1666424", + "X-Scheme": "https" +} diff --git a/pkg/ucp/frontend/controller/credentials/aws/testdata/aws-credential.json b/pkg/ucp/frontend/controller/credentials/aws/testdata/aws-credential.json index 99f677f723f..741e333627a 100644 --- a/pkg/ucp/frontend/controller/credentials/aws/testdata/aws-credential.json +++ b/pkg/ucp/frontend/controller/credentials/aws/testdata/aws-credential.json @@ -1,16 +1,16 @@ { - "id": "/planes/aws/awscloud/providers/System.AWS/credentials/default", - "type": "System.AWS/credentials", - "location": "West US", - "tags": { - "env": "dev" - }, - "properties": { - "accessKeyId": "00000000-0000-0000-0000-000000000000", - "secretAccessKey": "00000000-0000-0000-0000-000000000000", - "kind": "AccessKey", - "storage": { - "kind": "Internal" - } + "id": "/planes/aws/awscloud/providers/System.AWS/credentials/default", + "type": "System.AWS/credentials", + "location": "West US", + "tags": { + "env": "dev" + }, + "properties": { + "accessKeyId": "00000000-0000-0000-0000-000000000000", + "secretAccessKey": "00000000-0000-0000-0000-000000000000", + "kind": "AccessKey", + "storage": { + "kind": "Internal" } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/frontend/controller/credentials/aws/testdata/invalid-request-aws-credential.json b/pkg/ucp/frontend/controller/credentials/aws/testdata/invalid-request-aws-credential.json index d531c47585c..61cdf637e23 100644 --- a/pkg/ucp/frontend/controller/credentials/aws/testdata/invalid-request-aws-credential.json +++ b/pkg/ucp/frontend/controller/credentials/aws/testdata/invalid-request-aws-credential.json @@ -1,5 +1,5 @@ { - "id": "/planes/aws/awscloud/providers/System.AWS/credentials/default", - "type": "System.AWS/credentials", - "location": "West US" -} \ No newline at end of file + "id": "/planes/aws/awscloud/providers/System.AWS/credentials/default", + "type": "System.AWS/credentials", + "location": "West US" +} diff --git a/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview.json b/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview.json index 916b1c2f15f..af041e1c81b 100644 --- a/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview.json +++ b/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview.json @@ -1,8 +1,8 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "/planes/aws/awscloud/providers/System.AWS/credentials/default?api-version=2023-10-01-preview" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "/planes/aws/awscloud/providers/System.AWS/credentials/default?api-version=2023-10-01-preview" +} diff --git a/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview_badapiversion.json b/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview_badapiversion.json index 73fd4649fd6..54a78b67c8e 100644 --- a/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview_badapiversion.json +++ b/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview_badapiversion.json @@ -1,8 +1,8 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "/planes/aws/awscloud/providers/System.AWS/credentials/default?api-version=bad" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "/planes/aws/awscloud/providers/System.AWS/credentials/default?api-version=bad" +} diff --git a/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview_invalidcredential.json b/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview_invalidcredential.json index ce31c932349..89ae43b0126 100644 --- a/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview_invalidcredential.json +++ b/pkg/ucp/frontend/controller/credentials/aws/testdata/requestheaders20231001preview_invalidcredential.json @@ -1,8 +1,8 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "/planes/aws/awscloud/providers/System.AWS//default?api-version=2023-10-01-preview" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "/planes/aws/awscloud/providers/System.AWS//default?api-version=2023-10-01-preview" +} diff --git a/pkg/ucp/frontend/controller/credentials/azure/testdata/azure-credential.json b/pkg/ucp/frontend/controller/credentials/azure/testdata/azure-credential.json index d611fac0bbb..b1947962b80 100644 --- a/pkg/ucp/frontend/controller/credentials/azure/testdata/azure-credential.json +++ b/pkg/ucp/frontend/controller/credentials/azure/testdata/azure-credential.json @@ -1,18 +1,18 @@ { - "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", - "name": "default", - "type": "System.Azure/credentials", - "location": "West US", - "tags": { - "env": "dev" - }, - "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "clientId": "00000000-0000-0000-0000-000000000000", - "secret": "secret", - "kind": "ServicePrincipal", - "storage": { - "kind": "Internal" - } + "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", + "name": "default", + "type": "System.Azure/credentials", + "location": "West US", + "tags": { + "env": "dev" + }, + "properties": { + "tenantId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000", + "secret": "secret", + "kind": "ServicePrincipal", + "storage": { + "kind": "Internal" } -} \ No newline at end of file + } +} diff --git a/pkg/ucp/frontend/controller/credentials/azure/testdata/invalid-request-azure-credential.json b/pkg/ucp/frontend/controller/credentials/azure/testdata/invalid-request-azure-credential.json index 0fe0eab7f65..62916c8bdfb 100644 --- a/pkg/ucp/frontend/controller/credentials/azure/testdata/invalid-request-azure-credential.json +++ b/pkg/ucp/frontend/controller/credentials/azure/testdata/invalid-request-azure-credential.json @@ -1,5 +1,5 @@ { - "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", - "type": "System.Azure/credentials", - "location": "West US" -} \ No newline at end of file + "id": "/planes/azure/azurecloud/providers/System.Azure/credentials/default", + "type": "System.Azure/credentials", + "location": "West US" +} diff --git a/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview.json b/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview.json index 13ce7e250e0..6cd7bb81a85 100644 --- a/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview.json +++ b/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview.json @@ -1,8 +1,8 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "/planes/azure/azurecloud/providers/System.Azure/credentials/default?api-version=2023-10-01-preview" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "/planes/azure/azurecloud/providers/System.Azure/credentials/default?api-version=2023-10-01-preview" +} diff --git a/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview_badapiversion.json b/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview_badapiversion.json index 73fd4649fd6..54a78b67c8e 100644 --- a/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview_badapiversion.json +++ b/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview_badapiversion.json @@ -1,8 +1,8 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "/planes/aws/awscloud/providers/System.AWS/credentials/default?api-version=bad" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "/planes/aws/awscloud/providers/System.AWS/credentials/default?api-version=bad" +} diff --git a/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview_invalidcredential.json b/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview_invalidcredential.json index 633cf6d0ed7..a7178fbeec5 100644 --- a/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview_invalidcredential.json +++ b/pkg/ucp/frontend/controller/credentials/azure/testdata/requestheaders20231001preview_invalidcredential.json @@ -1,8 +1,8 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "/planes/azure/azurecloud/providers/System.Azure//default?api-version=2023-10-01-preview" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "/planes/azure/azurecloud/providers/System.Azure//default?api-version=2023-10-01-preview" +} diff --git a/pkg/ucp/frontend/controller/planes/testdata/createazureplane.json b/pkg/ucp/frontend/controller/planes/testdata/createazureplane.json index bf32dfda99e..2d32d24cab9 100644 --- a/pkg/ucp/frontend/controller/planes/testdata/createazureplane.json +++ b/pkg/ucp/frontend/controller/planes/testdata/createazureplane.json @@ -1,9 +1,9 @@ { - "location": "global", - "id": "/planes/azure/public", - "name": "local", - "type": "System.Azure/planes", - "properties": { - "kind": "Azure" - } -} \ No newline at end of file + "location": "global", + "id": "/planes/azure/public", + "name": "local", + "type": "System.Azure/planes", + "properties": { + "kind": "Azure" + } +} diff --git a/pkg/ucp/frontend/controller/planes/testdata/createucpnativeplane.json b/pkg/ucp/frontend/controller/planes/testdata/createucpnativeplane.json index 4bef6a71601..a67eaeb3d7a 100644 --- a/pkg/ucp/frontend/controller/planes/testdata/createucpnativeplane.json +++ b/pkg/ucp/frontend/controller/planes/testdata/createucpnativeplane.json @@ -1,13 +1,13 @@ { - "location": "global", - "id": "/planes/radius/local", - "name": "local", - "type": "System.Radius/planes", - "properties": { - "resourceProviders": { - "Applications.Core": "http://localhost:9080/", - "Applications.Connection": "http://localhost:9081/" - }, - "kind": "UCPNative" - } -} \ No newline at end of file + "location": "global", + "id": "/planes/radius/local", + "name": "local", + "type": "System.Radius/planes", + "properties": { + "resourceProviders": { + "Applications.Core": "http://localhost:9080/", + "Applications.Connection": "http://localhost:9081/" + }, + "kind": "UCPNative" + } +} diff --git a/pkg/ucp/frontend/controller/planes/testdata/createucpnativeplanenoproviders.json b/pkg/ucp/frontend/controller/planes/testdata/createucpnativeplanenoproviders.json index 89937a381dd..38ac6c2a68b 100644 --- a/pkg/ucp/frontend/controller/planes/testdata/createucpnativeplanenoproviders.json +++ b/pkg/ucp/frontend/controller/planes/testdata/createucpnativeplanenoproviders.json @@ -1,9 +1,9 @@ { - "location": "global", - "id": "/planes/radius/local", - "name": "local", - "type": "System.Radius/planes", - "properties": { - "kind": "UCPNative" - } -} \ No newline at end of file + "location": "global", + "id": "/planes/radius/local", + "name": "local", + "type": "System.Radius/planes", + "properties": { + "kind": "UCPNative" + } +} diff --git a/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview.json b/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview.json index fd9f809acb5..cdc59b8ada6 100644 --- a/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview.json +++ b/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview.json @@ -1,8 +1,8 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "/planes/radius/local?api-version=2023-10-01-preview" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "/planes/radius/local?api-version=2023-10-01-preview" +} diff --git a/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview_azure.json b/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview_azure.json index a4f8edcca8a..d873b02ea6a 100644 --- a/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview_azure.json +++ b/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview_azure.json @@ -1,8 +1,8 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "/planes/azure/public?api-version=2023-10-01-preview" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "/planes/azure/public?api-version=2023-10-01-preview" +} diff --git a/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview_nonexistentplane.json b/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview_nonexistentplane.json index 474a04e0773..9a6a73f7e0d 100644 --- a/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview_nonexistentplane.json +++ b/pkg/ucp/frontend/controller/planes/testdata/requestheaders20231001preview_nonexistentplane.json @@ -1,8 +1,8 @@ { - "Accept": "application/json", - "Accept-Encoding": "gzip, deflate", - "Accept-Language": "en-US", - "Content-Length": "305", - "Content-Type": "application/json; charset=utf-8", - "Referer": "/planes/abc/xyz?api-version=2023-10-01-preview" -} \ No newline at end of file + "Accept": "application/json", + "Accept-Encoding": "gzip, deflate", + "Accept-Language": "en-US", + "Content-Length": "305", + "Content-Type": "application/json; charset=utf-8", + "Referer": "/planes/abc/xyz?api-version=2023-10-01-preview" +} diff --git a/pkg/ucp/integrationtests/planes/testdata/awsplane_updated_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/planes/testdata/awsplane_updated_v20231001preview_requestbody.json index e90de57484a..05e32a818d5 100644 --- a/pkg/ucp/integrationtests/planes/testdata/awsplane_updated_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/planes/testdata/awsplane_updated_v20231001preview_requestbody.json @@ -3,6 +3,5 @@ "tags": { "updated": "yes" }, - "properties": { - } -} \ No newline at end of file + "properties": {} +} diff --git a/pkg/ucp/integrationtests/planes/testdata/awsplane_updated_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/planes/testdata/awsplane_updated_v20231001preview_responsebody.json index 175d42da191..cb368019c8f 100644 --- a/pkg/ucp/integrationtests/planes/testdata/awsplane_updated_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/planes/testdata/awsplane_updated_v20231001preview_responsebody.json @@ -9,4 +9,4 @@ "properties": { "provisioningState": "Succeeded" } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_list_responsebody.json b/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_list_responsebody.json index 37a1b0d3dea..9c04b62e219 100644 --- a/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_list_responsebody.json +++ b/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_list_responsebody.json @@ -11,4 +11,4 @@ } } ] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_requestbody.json index 849feac62f7..a3aab8e0f6b 100644 --- a/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_requestbody.json @@ -1,6 +1,5 @@ { "location": "global", "tags": {}, - "properties": { - } -} \ No newline at end of file + "properties": {} +} diff --git a/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_responsebody.json index cbed0a9db68..ecf9720581c 100644 --- a/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/planes/testdata/awsplane_v20231001preview_responsebody.json @@ -7,4 +7,4 @@ "properties": { "provisioningState": "Succeeded" } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/azureplane_updated_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/planes/testdata/azureplane_updated_v20231001preview_requestbody.json index 815ccc9b4fd..112888c9ff9 100644 --- a/pkg/ucp/integrationtests/planes/testdata/azureplane_updated_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/planes/testdata/azureplane_updated_v20231001preview_requestbody.json @@ -6,4 +6,4 @@ "properties": { "url": "https://management.azure.com/" } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/azureplane_updated_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/planes/testdata/azureplane_updated_v20231001preview_responsebody.json index 97d99edf139..4b1fda8100c 100644 --- a/pkg/ucp/integrationtests/planes/testdata/azureplane_updated_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/planes/testdata/azureplane_updated_v20231001preview_responsebody.json @@ -10,4 +10,4 @@ "provisioningState": "Succeeded", "url": "https://management.azure.com/" } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_list_responsebody.json b/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_list_responsebody.json index 406a8712b9d..8dfdbfa19ea 100644 --- a/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_list_responsebody.json +++ b/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_list_responsebody.json @@ -12,4 +12,4 @@ } } ] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_requestbody.json index 8561d8a8654..1eefe269a89 100644 --- a/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_requestbody.json @@ -3,4 +3,4 @@ "properties": { "url": "https://management.azure.com/" } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_responsebody.json index f7066c621a7..dd5d61c200e 100644 --- a/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/planes/testdata/azureplane_v20231001preview_responsebody.json @@ -8,4 +8,4 @@ "provisioningState": "Succeeded", "url": "https://management.azure.com/" } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/genericplane_v20231001preview_list_responsebody.json b/pkg/ucp/integrationtests/planes/testdata/genericplane_v20231001preview_list_responsebody.json index 7aeccbcf578..df0dafd562b 100644 --- a/pkg/ucp/integrationtests/planes/testdata/genericplane_v20231001preview_list_responsebody.json +++ b/pkg/ucp/integrationtests/planes/testdata/genericplane_v20231001preview_list_responsebody.json @@ -11,4 +11,4 @@ } } ] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/radiusplane_updated_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/planes/testdata/radiusplane_updated_v20231001preview_requestbody.json index 18c64307df8..ecbee691e3b 100644 --- a/pkg/ucp/integrationtests/planes/testdata/radiusplane_updated_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/planes/testdata/radiusplane_updated_v20231001preview_requestbody.json @@ -6,4 +6,4 @@ "another": "http://localhost:10000" } } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/radiusplane_updated_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/planes/testdata/radiusplane_updated_v20231001preview_responsebody.json index 4469fd299de..68b83af3e12 100644 --- a/pkg/ucp/integrationtests/planes/testdata/radiusplane_updated_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/planes/testdata/radiusplane_updated_v20231001preview_responsebody.json @@ -11,4 +11,4 @@ "another": "http://localhost:10000" } } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_list_responsebody.json b/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_list_responsebody.json index a292a400b08..6987b56fb8c 100644 --- a/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_list_responsebody.json +++ b/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_list_responsebody.json @@ -14,4 +14,4 @@ } } ] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_requestbody.json index 1718ad91ebf..771a4211cc4 100644 --- a/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_requestbody.json @@ -6,4 +6,4 @@ "test": "http://localhost:9999" } } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_responsebody.json index 1f5ec224650..e8d10e69f21 100644 --- a/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/planes/testdata/radiusplane_v20231001preview_responsebody.json @@ -10,4 +10,4 @@ "test": "http://localhost:9999" } } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_invalid_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_invalid_v20231001preview_requestbody.json index 336fcad19aa..1c02db24e8e 100644 --- a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_invalid_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_invalid_v20231001preview_requestbody.json @@ -1,6 +1,5 @@ { - "_location_oops": "global", - "name": "test-rg", - "properties":{ - } -} \ No newline at end of file + "_location_oops": "global", + "name": "test-rg", + "properties": {} +} diff --git a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_invalid_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_invalid_v20231001preview_responsebody.json index 5184d526893..ff18309686b 100644 --- a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_invalid_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_invalid_v20231001preview_responsebody.json @@ -1,13 +1,13 @@ { - "error": { - "code": "HttpRequestPayloadAPISpecValidationFailed", - "details": [ - { - "code": "InvalidProperties", - "message": "$.location in body is required" - } - ], - "message": "HTTP request payload failed validation against API specification with one or more errors. Please see details for more information.", - "target": "ucp/openapi" - } - } \ No newline at end of file + "error": { + "code": "HttpRequestPayloadAPISpecValidationFailed", + "details": [ + { + "code": "InvalidProperties", + "message": "$.location in body is required" + } + ], + "message": "HTTP request payload failed validation against API specification with one or more errors. Please see details for more information.", + "target": "ucp/openapi" + } +} diff --git a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_updated_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_updated_v20231001preview_requestbody.json index e838c983657..76fdb88b532 100644 --- a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_updated_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_updated_v20231001preview_requestbody.json @@ -1,6 +1,5 @@ { - "location": "global", - "name": "test-rg", - "properties":{ - } -} \ No newline at end of file + "location": "global", + "name": "test-rg", + "properties": {} +} diff --git a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_updated_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_updated_v20231001preview_responsebody.json index 64b15e9ddc4..63eb16c4e43 100644 --- a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_updated_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_updated_v20231001preview_responsebody.json @@ -1,7 +1,7 @@ { - "location": "global", - "id": "/planes/radius/local/resourcegroups/test-rg", - "name": "test-rg", - "tags": {}, - "type": "System.Resources/resourceGroups" -} \ No newline at end of file + "location": "global", + "id": "/planes/radius/local/resourcegroups/test-rg", + "name": "test-rg", + "tags": {}, + "type": "System.Resources/resourceGroups" +} diff --git a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_list_responsebody.json b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_list_responsebody.json index 8d3b8e4630d..e3de59d14c6 100644 --- a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_list_responsebody.json +++ b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_list_responsebody.json @@ -1,11 +1,11 @@ { - "value": [ - { - "location": "global", - "id": "/planes/radius/local/resourcegroups/test-rg", - "name": "test-rg", - "tags":{}, - "type": "System.Resources/resourceGroups" - } - ] -} \ No newline at end of file + "value": [ + { + "location": "global", + "id": "/planes/radius/local/resourcegroups/test-rg", + "name": "test-rg", + "tags": {}, + "type": "System.Resources/resourceGroups" + } + ] +} diff --git a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_requestbody.json index e838c983657..76fdb88b532 100644 --- a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_requestbody.json @@ -1,6 +1,5 @@ { - "location": "global", - "name": "test-rg", - "properties":{ - } -} \ No newline at end of file + "location": "global", + "name": "test-rg", + "properties": {} +} diff --git a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_responsebody.json index 1a99da964f5..63eb16c4e43 100644 --- a/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/resourcegroups/testdata/resourcegroup_v20231001preview_responsebody.json @@ -1,7 +1,7 @@ { - "location": "global", - "id": "/planes/radius/local/resourcegroups/test-rg", - "name": "test-rg", - "tags":{}, - "type": "System.Resources/resourceGroups" -} \ No newline at end of file + "location": "global", + "id": "/planes/radius/local/resourcegroups/test-rg", + "name": "test-rg", + "tags": {}, + "type": "System.Resources/resourceGroups" +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_emptylist_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_emptylist_responsebody.json index bcd37241563..74b8575872c 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_emptylist_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_emptylist_responsebody.json @@ -1,3 +1,3 @@ { "value": [] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_list_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_list_responsebody.json index 68f7e91778e..88b65d2d295 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_list_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_list_responsebody.json @@ -9,4 +9,4 @@ "type": "System.Resources/resourceproviders/resourcetypes/apiversions" } ] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_requestbody.json index c4d8e7a64d5..e685ecdaf98 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_requestbody.json @@ -4,4 +4,4 @@ "test": "my-test" }, "properties": {} -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_responsebody.json index 51eb3e7113b..34080fc07ea 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/apiversion_v20231001preview_responsebody.json @@ -5,4 +5,4 @@ "provisioningState": "Succeeded" }, "type": "System.Resources/resourceproviders/resourcetypes/apiversions" -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_emptylist_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_emptylist_responsebody.json index bcd37241563..74b8575872c 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_emptylist_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_emptylist_responsebody.json @@ -1,3 +1,3 @@ { "value": [] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_list_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_list_responsebody.json index f644f893058..cdbafb1d762 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_list_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_list_responsebody.json @@ -10,4 +10,4 @@ "type": "System.Resources/resourceProviders/locations" } ] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_requestbody.json index c4d8e7a64d5..e685ecdaf98 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_requestbody.json @@ -4,4 +4,4 @@ "test": "my-test" }, "properties": {} -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_responsebody.json index 4a385dbdb4f..d12c3e59ebf 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/location_v20231001preview_responsebody.json @@ -6,4 +6,4 @@ "resourceTypes": {} }, "type": "System.Resources/resourceProviders/locations" -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_emptylist_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_emptylist_responsebody.json index bcd37241563..74b8575872c 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_emptylist_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_emptylist_responsebody.json @@ -1,3 +1,3 @@ { "value": [] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_list_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_list_responsebody.json index a809b0035fe..07a9428bc30 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_list_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_list_responsebody.json @@ -13,4 +13,4 @@ "type": "System.Resources/resourceproviders" } ] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_requestbody.json index c4d8e7a64d5..e685ecdaf98 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_requestbody.json @@ -4,4 +4,4 @@ "test": "my-test" }, "properties": {} -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_responsebody.json index 7f1cfd4e4d9..919e419f3b8 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/resourceprovider_v20231001preview_responsebody.json @@ -9,4 +9,4 @@ "test": "my-test" }, "type": "System.Resources/resourceproviders" -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_emptylist_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_emptylist_responsebody.json index bcd37241563..74b8575872c 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_emptylist_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_emptylist_responsebody.json @@ -1,3 +1,3 @@ { "value": [] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_list_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_list_responsebody.json index f433b23a317..cda2b3ea776 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_list_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_list_responsebody.json @@ -10,4 +10,4 @@ "type": "System.Resources/resourceproviders/resourcetypes" } ] -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_requestbody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_requestbody.json index cbf7447da64..42aa792fb94 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_requestbody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_requestbody.json @@ -2,4 +2,4 @@ "properties": { "defaultApiVersion": "2025-01-01" } -} \ No newline at end of file +} diff --git a/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_responsebody.json b/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_responsebody.json index 21437a157c7..24b4c65d72e 100644 --- a/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_responsebody.json +++ b/pkg/ucp/integrationtests/resourceproviders/testdata/resourcetype_v20231001preview_responsebody.json @@ -6,4 +6,4 @@ "provisioningState": "Succeeded" }, "type": "System.Resources/resourceproviders/resourcetypes" -} \ No newline at end of file +} diff --git a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/downstream-request.json b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/downstream-request.json index 7fd227e4765..9f42457a406 100644 --- a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/downstream-request.json +++ b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/downstream-request.json @@ -1,8 +1,10 @@ { - "url": "http://example.com/planes/example/local/some-path?query=yes", - "method": "PUT", - "headers": { - "Referer": ["http://ucp.example.com/path/base/planes/example/local/some-path?query=yes"] - }, - "body": "" -} \ No newline at end of file + "url": "http://example.com/planes/example/local/some-path?query=yes", + "method": "PUT", + "headers": { + "Referer": [ + "http://ucp.example.com/path/base/planes/example/local/some-path?query=yes" + ] + }, + "body": "" +} diff --git a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/downstream-response.json b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/downstream-response.json index af9419e286e..92641a02ad7 100644 --- a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/downstream-response.json +++ b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/downstream-response.json @@ -1,8 +1,10 @@ { - "statusCode": 200, - "body": "{}", - "headers": { - "Azure-Asyncoperation": ["http://localhost:9443/planes/example/local/asyncresponseID"], - "Location": ["http://localhost:9443/planes/example/local/asyncresponseID"] - } -} \ No newline at end of file + "statusCode": 200, + "body": "{}", + "headers": { + "Azure-Asyncoperation": [ + "http://localhost:9443/planes/example/local/asyncresponseID" + ], + "Location": ["http://localhost:9443/planes/example/local/asyncresponseID"] + } +} diff --git a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/upstream-request.json b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/upstream-request.json index c90960ba9a0..5fc4796f1ef 100644 --- a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/upstream-request.json +++ b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/upstream-request.json @@ -1,7 +1,9 @@ { - "url": "http://ucp.example.com/planes/example/local/some-path?query=yes", - "headers": { - "Referer": ["http://ucp.example.com/path/base/planes/example/local/some-path?query=yes"] - }, - "method": "PUT" -} \ No newline at end of file + "url": "http://ucp.example.com/planes/example/local/some-path?query=yes", + "headers": { + "Referer": [ + "http://ucp.example.com/path/base/planes/example/local/some-path?query=yes" + ] + }, + "method": "PUT" +} diff --git a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/upstream-response.json b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/upstream-response.json index 36bad624a44..9a2c0e1f787 100644 --- a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/upstream-response.json +++ b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip-pathbase/upstream-response.json @@ -1,8 +1,12 @@ { - "statusCode": 200, - "headers": { - "Azure-Asyncoperation": ["http://ucp.example.com/path/base/planes/example/local/asyncresponseID"], - "Location": ["http://ucp.example.com/path/base/planes/example/local/asyncresponseID"] - }, - "body": "" -} \ No newline at end of file + "statusCode": 200, + "headers": { + "Azure-Asyncoperation": [ + "http://ucp.example.com/path/base/planes/example/local/asyncresponseID" + ], + "Location": [ + "http://ucp.example.com/path/base/planes/example/local/asyncresponseID" + ] + }, + "body": "" +} diff --git a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/downstream-request.json b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/downstream-request.json index f51674e8612..7789affa890 100644 --- a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/downstream-request.json +++ b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/downstream-request.json @@ -1,8 +1,10 @@ { - "url": "http://example.com/planes/example/local/some-path?query=yes", - "method": "PUT", - "headers": { - "Referer": ["http://ucp.example.com/planes/example/local/some-path?query=yes"] - }, - "body": "" -} \ No newline at end of file + "url": "http://example.com/planes/example/local/some-path?query=yes", + "method": "PUT", + "headers": { + "Referer": [ + "http://ucp.example.com/planes/example/local/some-path?query=yes" + ] + }, + "body": "" +} diff --git a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/downstream-response.json b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/downstream-response.json index af9419e286e..92641a02ad7 100644 --- a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/downstream-response.json +++ b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/downstream-response.json @@ -1,8 +1,10 @@ { - "statusCode": 200, - "body": "{}", - "headers": { - "Azure-Asyncoperation": ["http://localhost:9443/planes/example/local/asyncresponseID"], - "Location": ["http://localhost:9443/planes/example/local/asyncresponseID"] - } -} \ No newline at end of file + "statusCode": 200, + "body": "{}", + "headers": { + "Azure-Asyncoperation": [ + "http://localhost:9443/planes/example/local/asyncresponseID" + ], + "Location": ["http://localhost:9443/planes/example/local/asyncresponseID"] + } +} diff --git a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/upstream-request.json b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/upstream-request.json index eed5f00e23f..907e51cc821 100644 --- a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/upstream-request.json +++ b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/upstream-request.json @@ -1,7 +1,9 @@ { - "url": "http://ucp.example.com/planes/example/local/some-path?query=yes", - "headers": { - "Referer": ["http://ucp.example.com/planes/example/local/some-path?query=yes"] - }, - "method": "PUT" -} \ No newline at end of file + "url": "http://ucp.example.com/planes/example/local/some-path?query=yes", + "headers": { + "Referer": [ + "http://ucp.example.com/planes/example/local/some-path?query=yes" + ] + }, + "method": "PUT" +} diff --git a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/upstream-response.json b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/upstream-response.json index bb52ae109ed..118f86b466b 100644 --- a/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/upstream-response.json +++ b/pkg/ucp/proxy/testdata/arm/async-header-roundtrip/upstream-response.json @@ -1,8 +1,10 @@ { - "statusCode": 200, - "headers": { - "Azure-Asyncoperation": ["http://ucp.example.com/planes/example/local/asyncresponseID"], - "Location": ["http://ucp.example.com/planes/example/local/asyncresponseID"] - }, - "body": "" -} \ No newline at end of file + "statusCode": 200, + "headers": { + "Azure-Asyncoperation": [ + "http://ucp.example.com/planes/example/local/asyncresponseID" + ], + "Location": ["http://ucp.example.com/planes/example/local/asyncresponseID"] + }, + "body": "" +} diff --git a/pkg/ucp/proxy/testdata/arm/basic-roundtrip/downstream-request.json b/pkg/ucp/proxy/testdata/arm/basic-roundtrip/downstream-request.json index 1c9b0effc34..81743b29746 100644 --- a/pkg/ucp/proxy/testdata/arm/basic-roundtrip/downstream-request.json +++ b/pkg/ucp/proxy/testdata/arm/basic-roundtrip/downstream-request.json @@ -1,8 +1,8 @@ { - "url": "http://example.com/some-path?query=yes", - "method": "GET", - "headers": { - "traceparent": ["traceid"] - }, - "body": "" + "url": "http://example.com/some-path?query=yes", + "method": "GET", + "headers": { + "traceparent": ["traceid"] + }, + "body": "" } diff --git a/pkg/ucp/proxy/testdata/arm/basic-roundtrip/downstream-response.json b/pkg/ucp/proxy/testdata/arm/basic-roundtrip/downstream-response.json index 97c9d73f02c..362392ac025 100644 --- a/pkg/ucp/proxy/testdata/arm/basic-roundtrip/downstream-response.json +++ b/pkg/ucp/proxy/testdata/arm/basic-roundtrip/downstream-response.json @@ -1,9 +1,7 @@ { - "statusCode": 200, - "body": "{ \"message\": \"hello there!\" }", - "headers": { - "Content-Type": [ - "application/json" - ] - } + "statusCode": 200, + "body": "{ \"message\": \"hello there!\" }", + "headers": { + "Content-Type": ["application/json"] + } } diff --git a/pkg/ucp/proxy/testdata/arm/basic-roundtrip/upstream-request.json b/pkg/ucp/proxy/testdata/arm/basic-roundtrip/upstream-request.json index 20a9ab4556d..be9088c29fb 100644 --- a/pkg/ucp/proxy/testdata/arm/basic-roundtrip/upstream-request.json +++ b/pkg/ucp/proxy/testdata/arm/basic-roundtrip/upstream-request.json @@ -1,11 +1,11 @@ { - "url": "http://ucp.example.com/some-path?query=yes", - "method": "GET", - "headers": { - "traceparent": ["traceid"], - "X-Remote-User": ["fakeUser"], - "X-Remote-Group": ["fakeGroup"], - "X-Remote-Extra-Name": ["fakeExtraName"], - "X-Remote-Extra-Id": ["fakeExtraId"] - } + "url": "http://ucp.example.com/some-path?query=yes", + "method": "GET", + "headers": { + "traceparent": ["traceid"], + "X-Remote-User": ["fakeUser"], + "X-Remote-Group": ["fakeGroup"], + "X-Remote-Extra-Name": ["fakeExtraName"], + "X-Remote-Extra-Id": ["fakeExtraId"] + } } diff --git a/pkg/ucp/proxy/testdata/arm/basic-roundtrip/upstream-response.json b/pkg/ucp/proxy/testdata/arm/basic-roundtrip/upstream-response.json index 763189be536..e3303ff55cb 100644 --- a/pkg/ucp/proxy/testdata/arm/basic-roundtrip/upstream-response.json +++ b/pkg/ucp/proxy/testdata/arm/basic-roundtrip/upstream-response.json @@ -1,9 +1,7 @@ { - "statusCode": 200, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "body": "" + "statusCode": 200, + "headers": { + "Content-Type": ["application/json"] + }, + "body": "" } diff --git a/pkg/validator/testdata/put-environments-invalid-missing-kind.json b/pkg/validator/testdata/put-environments-invalid-missing-kind.json index aca96f5e765..1bbe72c12b9 100644 --- a/pkg/validator/testdata/put-environments-invalid-missing-kind.json +++ b/pkg/validator/testdata/put-environments-invalid-missing-kind.json @@ -1,8 +1,8 @@ { - "location": "West US", - "properties": { - "compute": { - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster" - } - } -} \ No newline at end of file + "location": "West US", + "properties": { + "compute": { + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster" + } + } +} diff --git a/pkg/validator/testdata/put-environments-invalid-missing-location.json b/pkg/validator/testdata/put-environments-invalid-missing-location.json index fd06239e041..b868d994df9 100644 --- a/pkg/validator/testdata/put-environments-invalid-missing-location.json +++ b/pkg/validator/testdata/put-environments-invalid-missing-location.json @@ -1,8 +1,8 @@ { - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster" - } - } -} \ No newline at end of file + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster" + } + } +} diff --git a/pkg/validator/testdata/put-environments-invalid-missing-locationandkind.json b/pkg/validator/testdata/put-environments-invalid-missing-locationandkind.json index 6c59814ab79..6bf2e542aad 100644 --- a/pkg/validator/testdata/put-environments-invalid-missing-locationandkind.json +++ b/pkg/validator/testdata/put-environments-invalid-missing-locationandkind.json @@ -1,7 +1,7 @@ { - "properties": { - "compute": { - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster" - } - } -} \ No newline at end of file + "properties": { + "compute": { + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster" + } + } +} diff --git a/pkg/validator/testdata/put-environments-valid-selfhost.json b/pkg/validator/testdata/put-environments-valid-selfhost.json index c22a3f8afb7..456bf5b16ec 100644 --- a/pkg/validator/testdata/put-environments-valid-selfhost.json +++ b/pkg/validator/testdata/put-environments-valid-selfhost.json @@ -1,8 +1,8 @@ { - "location": "West US", - "properties": { - "compute": { - "kind": "kubernetes" - } - } -} \ No newline at end of file + "location": "West US", + "properties": { + "compute": { + "kind": "kubernetes" + } + } +} diff --git a/pkg/validator/testdata/put-environments-valid.json b/pkg/validator/testdata/put-environments-valid.json index 0d0b24294f0..659758f10bc 100644 --- a/pkg/validator/testdata/put-environments-valid.json +++ b/pkg/validator/testdata/put-environments-valid.json @@ -1,9 +1,9 @@ { - "location": "West US", - "properties": { - "compute": { - "kind": "kubernetes", - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster" - } - } -} \ No newline at end of file + "location": "West US", + "properties": { + "compute": { + "kind": "kubernetes", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup/providers/Microsoft.ContainerService/managedClusters/radiusTestCluster" + } + } +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_CreateOrUpdate.json index 58b9d41de6c..b00214dee4f 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_CreateOrUpdate.json @@ -16,13 +16,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" } } @@ -45,13 +40,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -63,4 +53,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_CreateOrUpdate_BaseManifest.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_CreateOrUpdate_BaseManifest.json index ec310a19f85..698f3d9f615 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_CreateOrUpdate_BaseManifest.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_CreateOrUpdate_BaseManifest.json @@ -16,13 +16,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "runtimes": { @@ -50,13 +45,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "runtimes": { @@ -73,4 +63,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_Delete.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_Delete.json index 99ae7550886..346c7ab772f 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_Delete.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_Get.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_Get.json index 57dd6c65329..1a0dd1ff1e3 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_Get.json @@ -23,13 +23,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -41,4 +36,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_List.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_List.json index 49439c8f9aa..bf8906fadc8 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_List.json @@ -24,13 +24,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -55,13 +50,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -100,4 +90,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_ListByScope.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_ListByScope.json index 94e0ec01e43..80793eb554d 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_ListByScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Containers_ListByScope.json @@ -24,13 +24,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -82,13 +77,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -103,4 +93,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_CreateOrUpdate.json index 84a94402791..3ac4c935a2a 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_CreateOrUpdate.json @@ -127,4 +127,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_GetEnv0.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_GetEnv0.json index dd4c320eef2..f642d68789c 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_GetEnv0.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_GetEnv0.json @@ -92,4 +92,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_GetRecipeMetadata.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_GetRecipeMetadata.json index 6baed5642ab..b36a02ff896 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_GetRecipeMetadata.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_GetRecipeMetadata.json @@ -15,12 +15,12 @@ "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb", "parameters": { "throughput": { - "type" : "int", - "defaultValue" : 400 + "type": "int", + "defaultValue": 400 }, "location": { - "type" : "string", - "defaultValue" : "[resourceGroup().location]" + "type": "string", + "defaultValue": "[resourceGroup().location]" } } } diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_List.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_List.json index f1bb8b2096f..4654b8cba4b 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_List.json @@ -161,4 +161,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_PatchEnv0.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_PatchEnv0.json index 8f2e4b52bbe..bf296e2d0d1 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_PatchEnv0.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Environments_PatchEnv0.json @@ -110,4 +110,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_CreateOrUpdate.json index 76b4f159d16..fcbe3b9be02 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_CreateOrUpdate.json @@ -1,62 +1,61 @@ { "operationId": "Extenders_CreateOrUpdate", "title": "Create or Update an extender resource", - "parameters": { - "rootScope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup", - "extenderName": "extender0", - "api-version": "2023-10-01-preview", - "ExtenderParameters": { + "parameters": { + "rootScope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup", + "extenderName": "extender0", + "api-version": "2023-10-01-preview", + "ExtenderParameters": { + "location": "West US", + "properties": { + "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", + "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "secrets": { + "accountSid": "sid", + "authToken:": "token" + }, + "resourceProvisioning": "manual" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender0", + "name": "extender0", + "type": "Applications.Core/extenders", "location": "West US", "properties": { + "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "fromNumber": "222-222-2222", "secrets": { - "accountSid": "sid", - "authToken:": "token" + "accountSid": "sid", + "authToken:": "token" }, "resourceProvisioning": "manual" } } }, - "responses": { - "200": { - "body": { - "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender0", - "name": "extender0", - "type": "Applications.Core/extenders", - "location": "West US", - "properties": { - "provisioningState": "Succeeded", - "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", - "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "fromNumber": "222-222-2222", - "secrets": { - "accountSid": "sid", - "authToken:": "token" - }, - "resourceProvisioning": "manual" - } - } - }, - "201": { - "body": { - "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender1", - "name": "extender1", - "type": "Applications.Core/extenders", - "location": "West US", - "properties": { - "provisioningState": "Accepted", - "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", - "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "fromNumber": "222-222-2222", - "secrets": { - "accountSid": "sid", - "authToken:": "token" - }, - "resourceProvisioning": "manual" - } + "201": { + "body": { + "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender1", + "name": "extender1", + "type": "Applications.Core/extenders", + "location": "West US", + "properties": { + "provisioningState": "Accepted", + "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", + "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "fromNumber": "222-222-2222", + "secrets": { + "accountSid": "sid", + "authToken:": "token" + }, + "resourceProvisioning": "manual" } } } + } } - \ No newline at end of file diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_CreateOrUpdateWithRecipe.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_CreateOrUpdateWithRecipe.json index 15503ec0808..e6114950136 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_CreateOrUpdateWithRecipe.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_CreateOrUpdateWithRecipe.json @@ -1,13 +1,30 @@ { "operationId": "Extenders_CreateOrUpdate", "title": "Create or Update an extender resource with recipe", - "parameters": { - "rootScope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup", - "extenderName": "extender0", - "api-version": "2023-10-01-preview", - "ExtenderParameters": { + "parameters": { + "rootScope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup", + "extenderName": "extender0", + "api-version": "2023-10-01-preview", + "ExtenderParameters": { + "location": "West US", + "properties": { + "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", + "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "recipe": { + "name": "s3" + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender0", + "name": "extender0", + "type": "Applications.Core/extenders", "location": "West US", "properties": { + "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", "recipe": { @@ -16,39 +33,21 @@ } } }, - "responses": { - "200": { - "body": { - "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender0", - "name": "extender0", - "type": "Applications.Core/extenders", - "location": "West US", - "properties": { - "provisioningState": "Succeeded", - "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", - "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "recipe": { - "name": "s3" - } - } - } - }, - "201": { - "body": { - "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender1", - "name": "extender1", - "type": "Applications.Core/extenders", - "location": "West US", - "properties": { - "provisioningState": "Succeeded", - "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", - "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "recipe": { - "name": "s3" - } + "201": { + "body": { + "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender1", + "name": "extender1", + "type": "Applications.Core/extenders", + "location": "West US", + "properties": { + "provisioningState": "Succeeded", + "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", + "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "recipe": { + "name": "s3" } } } } + } } - \ No newline at end of file diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Delete.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Delete.json index 08aacc41cee..264542a8804 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Delete.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Get.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Get.json index 5a8ddbe87a9..af07af0473c 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Get.json @@ -28,4 +28,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_List.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_List.json index 9246caa3335..079d29b7370 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_List.json @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_ListByRootScope.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_ListByRootScope.json index b5e64de39af..f1e3ca328e5 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_ListByRootScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_ListByRootScope.json @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_ListSecrets.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_ListSecrets.json index 502d4831043..36cecd3ce56 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_ListSecrets.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_ListSecrets.json @@ -16,4 +16,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Update.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Update.json index 854d2f8b51d..f2e1d679b51 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Update.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Extenders_Update.json @@ -58,4 +58,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_CreateOrUpdate.json index 71fa5cf16b9..e2958e81475 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_CreateOrUpdate.json @@ -9,12 +9,12 @@ "location": "West US", "properties": { "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", @@ -32,12 +32,12 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_Get.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_Get.json index 7b8a09b3997..ce47781389d 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_Get.json @@ -15,12 +15,12 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_List.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_List.json index 4a2c0e8e39a..b795a209697 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_List.json @@ -16,12 +16,12 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_ListByScope.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_ListByScope.json index 225b186679e..06940110b25 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_ListByScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Gateways_ListByScope.json @@ -16,13 +16,13 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend", - "path":"/" + "path": "/" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", @@ -37,13 +37,13 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend", - "path":"/backend2" + "path": "/backend2" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_CreateOrUpdate_GlobalScope.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_CreateOrUpdate_GlobalScope.json index de3ab2d199b..091432f662d 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_CreateOrUpdate_GlobalScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_CreateOrUpdate_GlobalScope.json @@ -1,49 +1,49 @@ { - "operationId": "SecretStores_CreateOrUpdate", - "title": "Create or Update a secret store resource with global scope", - "parameters": { - "rootScope": "/planes/radius/local/resourceGroups/testGroup", - "secretStoreName": "secret", - "api-version": "2023-10-01-preview", - "SecretStoreResource": { + "operationId": "SecretStores_CreateOrUpdate", + "title": "Create or Update a secret store resource with global scope", + "parameters": { + "rootScope": "/planes/radius/local/resourceGroups/testGroup", + "secretStoreName": "secret", + "api-version": "2023-10-01-preview", + "SecretStoreResource": { + "location": "global", + "properties": { + "type": "certificate", + "data": { + "tls.crt": { + "encoding": "base64", + "value": "certificate" + }, + "tls.key": { + "encoding": "base64", + "value": "certificate" + } + }, + "resource": "testNamespace/secret" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/secretStores/secret", + "name": "secret", + "type": "Applications.Core/secretStores", "location": "global", "properties": { + "provisioningState": "Succeeded", "type": "certificate", "data": { "tls.crt": { - "encoding": "base64", - "value": "certificate" + "encoding": "base64" }, "tls.key": { - "encoding": "base64", - "value": "certificate" + "encoding": "base64" } }, "resource": "testNamespace/secret" } } - }, - "responses": { - "200": { - "body": { - "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/secretStores/secret", - "name": "secret", - "type": "Applications.Core/secretStores", - "location": "global", - "properties": { - "provisioningState": "Succeeded", - "type": "certificate", - "data": { - "tls.crt": { - "encoding": "base64" - }, - "tls.key": { - "encoding": "base64" - } - }, - "resource": "testNamespace/secret" - } - } - } } - } \ No newline at end of file + } +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_Get.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_Get.json index 32a9ff7fcf2..0b3f3efb4e9 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_Get.json @@ -18,10 +18,8 @@ "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", "type": "certificate", "data": { - "tls.crt": { - }, - "tls.key": { - } + "tls.crt": {}, + "tls.key": {} } } } diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_List.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_List.json index 4d95d3f6653..05625e08b5f 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/SecretStores_List.json @@ -19,10 +19,8 @@ "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", "type": "certificate", "data": { - "tls.crt": { - }, - "tls.key": { - } + "tls.crt": {}, + "tls.key": {} } } }, diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Volumes_Get.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Volumes_Get.json index 65624ce9c88..0a57a837ed3 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Volumes_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Volumes_Get.json @@ -52,4 +52,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Volumes_List.json b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Volumes_List.json index 0bf504f3b85..31c8274beab 100644 --- a/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Volumes_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Core/preview/2023-10-01-preview/examples/Volumes_List.json @@ -8,7 +8,8 @@ "responses": { "200": { "body": { - "value": [{ + "value": [ + { "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/volumes/keyvault0", "name": "keyvault0", "type": "Applications.Core/volumes", @@ -97,4 +98,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_CreateOrUpdate.json index d3e7bcfd169..b2cba5052df 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_CreateOrUpdate.json @@ -74,4 +74,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_CreateOrUpdateWithRecipe.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_CreateOrUpdateWithRecipe.json index 1e2a605fbfb..b1cca76a9a2 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_CreateOrUpdateWithRecipe.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_CreateOrUpdateWithRecipe.json @@ -63,4 +63,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Delete.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Delete.json index 63a568f43d2..40c2172e4de 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Delete.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Get.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Get.json index 964aca70fed..36521872b7e 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Get.json @@ -32,4 +32,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_List.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_List.json index c792841bd77..db218545371 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_List.json @@ -70,4 +70,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_ListByRootScope.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_ListByRootScope.json index 377dfe293c6..742c44fba97 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_ListByRootScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_ListByRootScope.json @@ -53,4 +53,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Update.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Update.json index 39ee6e7a623..886bb1a15da 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Update.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/ConfigurationStores_Update.json @@ -74,4 +74,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_CreateOrUpdate.json index 12d7590b534..3c2431411bd 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_CreateOrUpdate.json @@ -74,4 +74,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_CreateOrUpdateWithRecipe.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_CreateOrUpdateWithRecipe.json index dc6c0dd2d2a..c0fd8eea28b 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_CreateOrUpdateWithRecipe.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_CreateOrUpdateWithRecipe.json @@ -63,4 +63,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Delete.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Delete.json index 1a2b2092807..8d4c1657ddc 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Delete.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Get.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Get.json index a42b3a0e4a5..1c5c1491f2e 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Get.json @@ -32,4 +32,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_List.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_List.json index 8375beaa8bb..4754a95ad5d 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_List.json @@ -70,4 +70,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_ListByRootScope.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_ListByRootScope.json index f339de48399..7a5b7302ba6 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_ListByRootScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_ListByRootScope.json @@ -53,4 +53,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Update.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Update.json index d5c98f29d1d..58b083c8c1c 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Update.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/PubSubBrokers_Update.json @@ -74,4 +74,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_CreateOrUpdate.json index 9fd05878729..7e34284cc75 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_CreateOrUpdate.json @@ -60,4 +60,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Delete.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Delete.json index 0744553b204..440c2a02503 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Delete.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Get.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Get.json index 33e674b2903..d762a9f1515 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Get.json @@ -27,4 +27,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_List.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_List.json index fc273195f1c..b58043435ca 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_List.json @@ -48,4 +48,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_ListByRootScope.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_ListByRootScope.json index b01f25fdfb1..15eaca17242 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_ListByRootScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_ListByRootScope.json @@ -48,4 +48,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Update.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Update.json index 319e3d8dc54..93e08680478 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Update.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/SecretStores_Update.json @@ -60,4 +60,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_CreateOrUpdate.json index 2baaa6b55b1..1cc5b1a0d40 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_CreateOrUpdate.json @@ -70,4 +70,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_CreateOrUpdateWithRecipe.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_CreateOrUpdateWithRecipe.json index 149fec66728..07b15806d7a 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_CreateOrUpdateWithRecipe.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_CreateOrUpdateWithRecipe.json @@ -52,4 +52,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Delete.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Delete.json index bfe774ce31f..73d263483da 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Delete.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Get.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Get.json index 1605c358111..bfabbb914b4 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Get.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_List.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_List.json index 8db892bac72..ca069e4921f 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_List.json @@ -89,4 +89,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_ListByRootScope.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_ListByRootScope.json index 2c98dc98d6d..808dfe201b6 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_ListByRootScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_ListByRootScope.json @@ -75,4 +75,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Update.json b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Update.json index 4ffd10fdedc..3013baf8e17 100644 --- a/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Update.json +++ b/swagger/specification/applications/resource-manager/Applications.Dapr/preview/2023-10-01-preview/examples/StateStores_Update.json @@ -70,4 +70,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_CreateOrUpdateRecipe.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_CreateOrUpdateRecipe.json index 392896fcc8c..2fc3d94b805 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_CreateOrUpdateRecipe.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_CreateOrUpdateRecipe.json @@ -59,4 +59,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_CreateOrUpdateValues.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_CreateOrUpdateValues.json index 897dc206766..7d4b10b286e 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_CreateOrUpdateValues.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_CreateOrUpdateValues.json @@ -62,4 +62,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Delete.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Delete.json index 752653650f7..0a05ea6d619 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Delete.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Get.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Get.json index a0a7b8f5d0c..bea442b12a4 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Get.json @@ -30,4 +30,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_List.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_List.json index c280d951c50..8867641fa7d 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_List.json @@ -70,4 +70,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_ListByRootScope.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_ListByRootScope.json index 1aa71c6e079..1014ca1a2aa 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_ListByRootScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_ListByRootScope.json @@ -71,4 +71,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Update.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Update.json index a9d61d4d0e9..2bff961d72f 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Update.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/MongoDatabases_Update.json @@ -62,4 +62,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdate.json index 57510928650..d478e3a3bd7 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdate.json @@ -65,4 +65,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdateRecipe.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdateRecipe.json index 64512247560..d7a8f741b60 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdateRecipe.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdateRecipe.json @@ -59,4 +59,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdateValues.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdateValues.json index 88d9dcfb89f..4d4f6a45bd3 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdateValues.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_CreateOrUpdateValues.json @@ -56,4 +56,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Delete.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Delete.json index e468f72cd66..cb9eec9c232 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Delete.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Get.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Get.json index aca26b7c225..1b6ebeb4923 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Get.json @@ -30,4 +30,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_List.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_List.json index 21e6ae05926..905f450635e 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_List.json @@ -66,4 +66,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_ListByRootScope.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_ListByRootScope.json index ecf024fb104..f405d6b9a1a 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_ListByRootScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_ListByRootScope.json @@ -65,4 +65,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_ListSecrets.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_ListSecrets.json index 185cec6a7cd..8a7e49da322 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_ListSecrets.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_ListSecrets.json @@ -16,4 +16,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Update.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Update.json index f1ac392db3f..aa1148154ee 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Update.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/RedisCaches_Update.json @@ -65,4 +65,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_CreateOrUpdate.json index 7f4a9de8f22..147e1958c79 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_CreateOrUpdate.json @@ -49,4 +49,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Delete.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Delete.json index a092eecce33..21e3e41d8ed 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Delete.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Get.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Get.json index 2de248c7b27..4390634640c 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Get.json @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_List.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_List.json index 04ca8b7bbf8..3afc35e8d25 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_List.json @@ -64,4 +64,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_ListByRootScope.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_ListByRootScope.json index 9c6de5f03ac..aab8f047895 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_ListByRootScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_ListByRootScope.json @@ -69,4 +69,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Update.json b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Update.json index 13d60114477..c4a59f0de50 100644 --- a/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Update.json +++ b/swagger/specification/applications/resource-manager/Applications.Datastores/preview/2023-10-01-preview/examples/SQLDatabases_Update.json @@ -49,4 +49,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_CreateOrUpdate.json b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_CreateOrUpdate.json index 0b51ad6fdbc..d27d1aa9dea 100644 --- a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_CreateOrUpdate.json +++ b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_CreateOrUpdate.json @@ -56,4 +56,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Delete.json b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Delete.json index d78bb91dd57..2eacd771a00 100644 --- a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Delete.json +++ b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Get.json b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Get.json index ddd1cb632dd..530a7c38ce8 100644 --- a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Get.json +++ b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Get.json @@ -26,4 +26,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_List.json b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_List.json index 83383819e0e..d5ecd4fa433 100644 --- a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_List.json +++ b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_List.json @@ -44,4 +44,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_ListByRootScope.json b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_ListByRootScope.json index d932a9a7a37..5e4658bc45d 100644 --- a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_ListByRootScope.json +++ b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_ListByRootScope.json @@ -47,4 +47,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_ListSecrets.json b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_ListSecrets.json index 686ec415e05..3be84807872 100644 --- a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_ListSecrets.json +++ b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_ListSecrets.json @@ -14,4 +14,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Update.json b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Update.json index 61dff0e3234..04e9acfeca6 100644 --- a/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Update.json +++ b/swagger/specification/applications/resource-manager/Applications.Messaging/preview/2023-10-01-preview/examples/RabbitMQQueues_Update.json @@ -56,4 +56,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/applications/resource-manager/Test.Resource/preview/2022-08-19-preview/openapi.json b/swagger/specification/applications/resource-manager/Test.Resource/preview/2022-08-19-preview/openapi.json index 0479c3f9534..36d7927a81d 100644 --- a/swagger/specification/applications/resource-manager/Test.Resource/preview/2022-08-19-preview/openapi.json +++ b/swagger/specification/applications/resource-manager/Test.Resource/preview/2022-08-19-preview/openapi.json @@ -10,21 +10,13 @@ } ] }, - "schemes": [ - "https" - ], + "schemes": ["https"], "host": "management.azure.com", - "produces": [ - "application/json" - ], - "consumes": [ - "application/json" - ], + "produces": ["application/json"], + "consumes": ["application/json"], "security": [ { - "azure_auth": [ - "user_impersonation" - ] + "azure_auth": ["user_impersonation"] } ], "securityDefinitions": { @@ -50,9 +42,7 @@ "/{rootScope}/providers/Test.Resource/testAsyncResources": { "get": { "operationId": "TestAsyncResources_ListByScope", - "tags": [ - "TestAsyncResources" - ], + "tags": ["TestAsyncResources"], "description": "List TestAsyncResource resources by Scope", "parameters": [ { @@ -92,9 +82,7 @@ "/{rootScope}/providers/Test.Resource/testAsyncResources/{testAsyncResourceName}": { "get": { "operationId": "TestAsyncResources_Get", - "tags": [ - "TestAsyncResources" - ], + "tags": ["TestAsyncResources"], "description": "Get a TestAsyncResource", "parameters": [ { @@ -135,9 +123,7 @@ }, "put": { "operationId": "TestAsyncResources_CreateOrUpdate", - "tags": [ - "TestAsyncResources" - ], + "tags": ["TestAsyncResources"], "description": "Create a TestAsyncResource", "parameters": [ { @@ -204,9 +190,7 @@ }, "patch": { "operationId": "TestAsyncResources_Update", - "tags": [ - "TestAsyncResources" - ], + "tags": ["TestAsyncResources"], "description": "Update a TestAsyncResource", "parameters": [ { @@ -274,9 +258,7 @@ }, "delete": { "operationId": "TestAsyncResources_Delete", - "tags": [ - "TestAsyncResources" - ], + "tags": ["TestAsyncResources"], "description": "Delete a TestAsyncResource", "parameters": [ { @@ -337,9 +319,7 @@ "/providers/Test.Resource/operations": { "get": { "operationId": "Operations_List", - "tags": [ - "Operations" - ], + "tags": ["Operations"], "description": "List the operations for the provider", "parameters": [ { @@ -385,17 +365,12 @@ } }, "discriminator": "kind", - "required": [ - "kind" - ] + "required": ["kind"] }, "IdentitySettingKind": { "type": "string", "description": "IdentitySettingKind is the kind of supported external identity setting", - "enum": [ - "undefined", - "azure.com.workload" - ], + "enum": ["undefined", "azure.com.workload"], "x-ms-enum": { "name": "IdentitySettingKind", "modelAsString": true, @@ -430,9 +405,7 @@ "description": "The resource ID of the provisioned identity" } }, - "required": [ - "kind" - ] + "required": ["kind"] }, "KubernetesCompute": { "type": "object", @@ -443,9 +416,7 @@ "description": "The namespace to use for the environment." } }, - "required": [ - "namespace" - ], + "required": ["namespace"], "allOf": [ { "$ref": "#/definitions/EnvironmentCompute" @@ -552,10 +523,7 @@ "$ref": "#/definitions/TestAsyncResourceProperties", "description": "The resource-specific properties for this resource.", "x-ms-client-flatten": true, - "x-ms-mutability": [ - "read", - "create" - ] + "x-ms-mutability": ["read", "create"] } }, "allOf": [ @@ -581,9 +549,7 @@ "description": "The link to the next page of items" } }, - "required": [ - "value" - ] + "required": ["value"] }, "TestAsyncResourceProperties": { "type": "object", @@ -612,10 +578,7 @@ "description": "The property1 of TestASyncResource" } }, - "required": [ - "application", - "property1" - ] + "required": ["application", "property1"] }, "TestAsyncResourceUpdate": { "type": "object", @@ -660,10 +623,7 @@ "$ref": "#/definitions/TestSyncResourceProperties", "description": "The resource-specific properties for this resource.", "x-ms-client-flatten": true, - "x-ms-mutability": [ - "read", - "create" - ] + "x-ms-mutability": ["read", "create"] } }, "allOf": [ @@ -699,18 +659,12 @@ "description": "The property1 of TestSyncResource" } }, - "required": [ - "application", - "property1" - ] + "required": ["application", "property1"] }, "Versions": { "type": "string", "description": "Supported API versions for the Test.Resource resource provider.", - "enum": [ - "2022-08-19-preview", - "2023-08-19" - ], + "enum": ["2022-08-19-preview", "2023-08-19"], "x-ms-enum": { "name": "Versions", "modelAsString": true, diff --git a/swagger/specification/applications/resource-manager/Test.Resource/stable/2023-08-19/openapi.json b/swagger/specification/applications/resource-manager/Test.Resource/stable/2023-08-19/openapi.json index 0cd70b56f65..51ffc3977dd 100644 --- a/swagger/specification/applications/resource-manager/Test.Resource/stable/2023-08-19/openapi.json +++ b/swagger/specification/applications/resource-manager/Test.Resource/stable/2023-08-19/openapi.json @@ -10,21 +10,13 @@ } ] }, - "schemes": [ - "https" - ], + "schemes": ["https"], "host": "management.azure.com", - "produces": [ - "application/json" - ], - "consumes": [ - "application/json" - ], + "produces": ["application/json"], + "consumes": ["application/json"], "security": [ { - "azure_auth": [ - "user_impersonation" - ] + "azure_auth": ["user_impersonation"] } ], "securityDefinitions": { @@ -53,9 +45,7 @@ "/{rootScope}/providers/Test.Resource/testAsyncResources": { "get": { "operationId": "TestAsyncResources_ListByScope", - "tags": [ - "TestAsyncResources" - ], + "tags": ["TestAsyncResources"], "description": "List TestAsyncResource resources by Scope", "parameters": [ { @@ -95,9 +85,7 @@ "/{rootScope}/providers/Test.Resource/testAsyncResources/{testAsyncResourceName}": { "get": { "operationId": "TestAsyncResources_Get", - "tags": [ - "TestAsyncResources" - ], + "tags": ["TestAsyncResources"], "description": "Get a TestAsyncResource", "parameters": [ { @@ -138,9 +126,7 @@ }, "put": { "operationId": "TestAsyncResources_CreateOrUpdate", - "tags": [ - "TestAsyncResources" - ], + "tags": ["TestAsyncResources"], "description": "Create a TestAsyncResource", "parameters": [ { @@ -207,9 +193,7 @@ }, "patch": { "operationId": "TestAsyncResources_Update", - "tags": [ - "TestAsyncResources" - ], + "tags": ["TestAsyncResources"], "description": "Update a TestAsyncResource", "parameters": [ { @@ -277,9 +261,7 @@ }, "delete": { "operationId": "TestAsyncResources_Delete", - "tags": [ - "TestAsyncResources" - ], + "tags": ["TestAsyncResources"], "description": "Delete a TestAsyncResource", "parameters": [ { @@ -340,9 +322,7 @@ "/{rootScope}/providers/Test.Resource/testSyncResources": { "get": { "operationId": "TestSyncResources_ListByScope", - "tags": [ - "TestSyncResources" - ], + "tags": ["TestSyncResources"], "description": "List TestSyncResource resources by Scope", "parameters": [ { @@ -382,9 +362,7 @@ "/{rootScope}/providers/Test.Resource/testSyncResources/{testSyncResourceName}": { "get": { "operationId": "TestSyncResources_Get", - "tags": [ - "TestSyncResources" - ], + "tags": ["TestSyncResources"], "description": "Get a TestSyncResource", "parameters": [ { @@ -425,9 +403,7 @@ }, "put": { "operationId": "TestSyncResources_CreateOrUpdate", - "tags": [ - "TestSyncResources" - ], + "tags": ["TestSyncResources"], "description": "Create a TestSyncResource", "parameters": [ { @@ -483,9 +459,7 @@ }, "patch": { "operationId": "TestSyncResources_Update", - "tags": [ - "TestSyncResources" - ], + "tags": ["TestSyncResources"], "description": "Update a TestSyncResource", "parameters": [ { @@ -535,9 +509,7 @@ }, "delete": { "operationId": "TestSyncResources_Delete", - "tags": [ - "TestSyncResources" - ], + "tags": ["TestSyncResources"], "description": "Delete a TestSyncResource", "parameters": [ { @@ -575,9 +547,7 @@ "/providers/Test.Resource/operations": { "get": { "operationId": "Operations_List", - "tags": [ - "Operations" - ], + "tags": ["Operations"], "description": "List the operations for the provider", "parameters": [ { @@ -623,17 +593,12 @@ } }, "discriminator": "kind", - "required": [ - "kind" - ] + "required": ["kind"] }, "IdentitySettingKind": { "type": "string", "description": "IdentitySettingKind is the kind of supported external identity setting", - "enum": [ - "undefined", - "azure.com.workload" - ], + "enum": ["undefined", "azure.com.workload"], "x-ms-enum": { "name": "IdentitySettingKind", "modelAsString": true, @@ -668,9 +633,7 @@ "description": "The resource ID of the provisioned identity" } }, - "required": [ - "kind" - ] + "required": ["kind"] }, "KubernetesCompute": { "type": "object", @@ -681,9 +644,7 @@ "description": "The namespace to use for the environment." } }, - "required": [ - "namespace" - ], + "required": ["namespace"], "allOf": [ { "$ref": "#/definitions/EnvironmentCompute" @@ -790,10 +751,7 @@ "$ref": "#/definitions/TestAsyncResourceProperties", "description": "The resource-specific properties for this resource.", "x-ms-client-flatten": true, - "x-ms-mutability": [ - "read", - "create" - ] + "x-ms-mutability": ["read", "create"] } }, "allOf": [ @@ -819,9 +777,7 @@ "description": "The link to the next page of items" } }, - "required": [ - "value" - ] + "required": ["value"] }, "TestAsyncResourceProperties": { "type": "object", @@ -850,10 +806,7 @@ "description": "The property1 of TestASyncResource" } }, - "required": [ - "application", - "property1" - ] + "required": ["application", "property1"] }, "TestAsyncResourceUpdate": { "type": "object", @@ -898,10 +851,7 @@ "$ref": "#/definitions/TestSyncResourceProperties", "description": "The resource-specific properties for this resource.", "x-ms-client-flatten": true, - "x-ms-mutability": [ - "read", - "create" - ] + "x-ms-mutability": ["read", "create"] } }, "allOf": [ @@ -927,9 +877,7 @@ "description": "The link to the next page of items" } }, - "required": [ - "value" - ] + "required": ["value"] }, "TestSyncResourceProperties": { "type": "object", @@ -958,10 +906,7 @@ "description": "The property1 of TestSyncResource" } }, - "required": [ - "application", - "property1" - ] + "required": ["application", "property1"] }, "TestSyncResourceUpdate": { "type": "object", @@ -1001,10 +946,7 @@ "Versions": { "type": "string", "description": "Supported API versions for the Test.Resource resource provider.", - "enum": [ - "2022-08-19-preview", - "2023-08-19" - ], + "enum": ["2022-08-19-preview", "2023-08-19"], "x-ms-enum": { "name": "Versions", "modelAsString": true, diff --git a/swagger/specification/common-types/resource-management/v2/privatelinks.json b/swagger/specification/common-types/resource-management/v2/privatelinks.json index 117c93054e7..468b6891f1e 100644 --- a/swagger/specification/common-types/resource-management/v2/privatelinks.json +++ b/swagger/specification/common-types/resource-management/v2/privatelinks.json @@ -49,9 +49,7 @@ "description": "The provisioning state of the private endpoint connection resource." } }, - "required": [ - "privateLinkServiceConnectionState" - ], + "required": ["privateLinkServiceConnectionState"], "description": "Properties of the PrivateEndpointConnectProperties." }, "PrivateLinkServiceConnectionState": { @@ -75,11 +73,7 @@ "PrivateEndpointServiceConnectionStatus": { "type": "string", "description": "The private endpoint connection status.", - "enum": [ - "Pending", - "Approved", - "Rejected" - ], + "enum": ["Pending", "Approved", "Rejected"], "x-ms-enum": { "name": "PrivateEndpointServiceConnectionStatus", "modelAsString": true @@ -89,12 +83,7 @@ "type": "string", "readOnly": true, "description": "The current provisioning state.", - "enum": [ - "Succeeded", - "Creating", - "Deleting", - "Failed" - ], + "enum": ["Succeeded", "Creating", "Deleting", "Failed"], "x-ms-enum": { "name": "PrivateEndpointConnectionProvisioningState", "modelAsString": true diff --git a/swagger/specification/common-types/resource-management/v2/types.json b/swagger/specification/common-types/resource-management/v2/types.json index 4f1bb5d91e3..1c16d31acfa 100644 --- a/swagger/specification/common-types/resource-management/v2/types.json +++ b/swagger/specification/common-types/resource-management/v2/types.json @@ -57,25 +57,16 @@ "additionalProperties": { "type": "string" }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], + "x-ms-mutability": ["read", "create", "update"], "description": "Resource tags." }, "location": { "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], + "x-ms-mutability": ["read", "create"], "description": "The geo-location where the resource lives" } }, - "required": [ - "location" - ], + "required": ["location"], "allOf": [ { "$ref": "#/definitions/Resource" @@ -99,9 +90,7 @@ "id": { "readOnly": true, "type": "string", - "x-ms-mutability": [ - "read" - ], + "x-ms-mutability": ["read"], "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" }, "name": { @@ -112,34 +101,22 @@ "type": { "readOnly": true, "type": "string", - "x-ms-mutability": [ - "read" - ], + "x-ms-mutability": ["read"], "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" }, "location": { "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], + "x-ms-mutability": ["read", "create"], "description": "The geo-location where the resource lives" }, "managedBy": { "type": "string", - "x-ms-mutability": [ - "read", - "create", - "update" - ], + "x-ms-mutability": ["read", "create", "update"], "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource." }, "kind": { "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], + "x-ms-mutability": ["read", "create"], "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource provider must validate and persist this value.", "pattern": "^[-\\w\\._,\\(\\)]+$" }, @@ -153,11 +130,7 @@ "additionalProperties": { "type": "string" }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], + "x-ms-mutability": ["read", "create", "update"], "description": "Resource tags." }, "identity": { @@ -194,12 +167,7 @@ }, "tier": { "type": "string", - "enum": [ - "Free", - "Basic", - "Standard", - "Premium" - ], + "enum": ["Free", "Basic", "Standard", "Premium"], "x-ms-enum": { "name": "SkuTier", "modelAsString": false @@ -220,9 +188,7 @@ "description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted." } }, - "required": [ - "name" - ] + "required": ["name"] }, "Identity": { "description": "Identity for the resource.", @@ -241,9 +207,7 @@ "type": { "type": "string", "description": "The identity type.", - "enum": [ - "SystemAssigned" - ], + "enum": ["SystemAssigned"], "x-ms-enum": { "name": "ResourceIdentityType", "modelAsString": false @@ -276,11 +240,7 @@ } }, "description": "Plan for the resource.", - "required": [ - "name", - "publisher", - "product" - ] + "required": ["name", "publisher", "product"] }, "ErrorDetail": { "description": "The error detail.", @@ -307,10 +267,7 @@ "items": { "$ref": "#/definitions/ErrorDetail" }, - "x-ms-identifiers": [ - "message", - "target" - ], + "x-ms-identifiers": ["message", "target"], "description": "The error details." }, "additionalInfo": { @@ -396,11 +353,7 @@ "description": "The intended executor of the operation; as in Resource Based Access Control (RBAC) and audit logs UX. Default value is \"user,system\"", "type": "string", "readOnly": true, - "enum": [ - "user", - "system", - "user,system" - ], + "enum": ["user", "system", "user,system"], "x-ms-enum": { "name": "Origin", "modelAsString": true @@ -410,9 +363,7 @@ "description": "Enum. Indicates the action type. \"Internal\" refers to actions that are for internal only APIs.", "type": "string", "readOnly": true, - "enum": [ - "Internal" - ], + "enum": ["Internal"], "x-ms-enum": { "name": "ActionType", "modelAsString": true @@ -429,9 +380,7 @@ "items": { "$ref": "#/definitions/Operation" }, - "x-ms-identifiers": [ - "name" - ], + "x-ms-identifiers": ["name"], "description": "List of operations supported by the resource provider", "readOnly": true }, @@ -445,9 +394,7 @@ "OperationStatusResult": { "description": "The current status of an async operation.", "type": "object", - "required": [ - "status" - ], + "required": ["status"], "properties": { "id": { "description": "Fully qualified ID for the async operation.", @@ -512,9 +459,7 @@ "description": "The country or region where the resource is located" } }, - "required": [ - "name" - ] + "required": ["name"] }, "systemData": { "description": "Metadata pertaining to creation and last modification of the resource.", @@ -528,12 +473,7 @@ "createdByType": { "type": "string", "description": "The type of identity that created the resource.", - "enum": [ - "User", - "Application", - "ManagedIdentity", - "Key" - ], + "enum": ["User", "Application", "ManagedIdentity", "Key"], "x-ms-enum": { "name": "createdByType", "modelAsString": true @@ -551,12 +491,7 @@ "lastModifiedByType": { "type": "string", "description": "The type of identity that last modified the resource.", - "enum": [ - "User", - "Application", - "ManagedIdentity", - "Key" - ], + "enum": ["User", "Application", "ManagedIdentity", "Key"], "x-ms-enum": { "name": "createdByType", "modelAsString": true @@ -575,10 +510,7 @@ "properties": { "status": { "description": "Indicates whether or not the encryption is enabled for container registry.", - "enum": [ - "enabled", - "disabled" - ], + "enum": ["enabled", "disabled"], "type": "string", "x-ms-enum": { "name": "EncryptionStatus", @@ -629,10 +561,7 @@ "reason": { "description": "The reason why the given name is not available.", "type": "string", - "enum": [ - "Invalid", - "AlreadyExists" - ], + "enum": ["Invalid", "AlreadyExists"], "x-ms-enum": { "name": "CheckNameAvailabilityReason", "modelAsString": true @@ -691,4 +620,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} diff --git a/swagger/specification/common-types/resource-management/v3/managedidentity.json b/swagger/specification/common-types/resource-management/v3/managedidentity.json index 4d8d7da303e..3b371cb83f1 100644 --- a/swagger/specification/common-types/resource-management/v3/managedidentity.json +++ b/swagger/specification/common-types/resource-management/v3/managedidentity.json @@ -1,113 +1,106 @@ { - "swagger": "2.0", - "info": { - "version": "3.0", - "title": "Common types" + "swagger": "2.0", + "info": { + "version": "3.0", + "title": "Common types" + }, + "paths": {}, + "definitions": { + "UserAssignedIdentities": { + "title": "User-Assigned Identities", + "description": "The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests.", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/UserAssignedIdentity" + } }, - "paths": {}, - "definitions": { - "UserAssignedIdentities": { - "title": "User-Assigned Identities", - "description": "The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests.", - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/UserAssignedIdentity" - } - }, - "UserAssignedIdentity": { - "type": "object", - "description": "User assigned identity properties", - "properties": { - "principalId": { - "description": "The principal ID of the assigned identity.", - "format": "uuid", - "type": "string", - "readOnly": true - }, - "clientId": { - "description": "The client ID of the assigned identity.", - "format": "uuid", - "type": "string", - "readOnly": true - } + "UserAssignedIdentity": { + "type": "object", + "description": "User assigned identity properties", + "properties": { + "principalId": { + "description": "The principal ID of the assigned identity.", + "format": "uuid", + "type": "string", + "readOnly": true + }, + "clientId": { + "description": "The client ID of the assigned identity.", + "format": "uuid", + "type": "string", + "readOnly": true } - }, - "ManagedServiceIdentityType": { - "description": "Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).", - "enum": [ - "None", - "SystemAssigned", - "UserAssigned", - "SystemAssigned,UserAssigned" - ], - "type": "string", - "x-ms-enum": { - "name": "ManagedServiceIdentityType", - "modelAsString": true + } + }, + "ManagedServiceIdentityType": { + "description": "Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).", + "enum": [ + "None", + "SystemAssigned", + "UserAssigned", + "SystemAssigned,UserAssigned" + ], + "type": "string", + "x-ms-enum": { + "name": "ManagedServiceIdentityType", + "modelAsString": true + } + }, + "ManagedServiceIdentity": { + "description": "Managed service identity (system assigned and/or user assigned identities)", + "type": "object", + "properties": { + "principalId": { + "readOnly": true, + "format": "uuid", + "type": "string", + "description": "The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity." + }, + "tenantId": { + "readOnly": true, + "format": "uuid", + "type": "string", + "description": "The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity." + }, + "type": { + "$ref": "#/definitions/ManagedServiceIdentityType" + }, + "userAssignedIdentities": { + "$ref": "#/definitions/UserAssignedIdentities" } }, - "ManagedServiceIdentity": { - "description": "Managed service identity (system assigned and/or user assigned identities)", - "type": "object", - "properties": { - "principalId": { - "readOnly": true, - "format": "uuid", - "type": "string", - "description": "The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity." - }, - "tenantId": { - "readOnly": true, - "format": "uuid", - "type": "string", - "description": "The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity." - }, - "type": { - "$ref": "#/definitions/ManagedServiceIdentityType" - }, - "userAssignedIdentities": { - "$ref": "#/definitions/UserAssignedIdentities" - } + "required": ["type"] + }, + "SystemAssignedServiceIdentityType": { + "description": "Type of managed service identity (either system assigned, or none).", + "enum": ["None", "SystemAssigned"], + "type": "string", + "x-ms-enum": { + "name": "SystemAssignedServiceIdentityType", + "modelAsString": true + } + }, + "SystemAssignedServiceIdentity": { + "description": "Managed service identity (either system assigned, or none)", + "type": "object", + "properties": { + "principalId": { + "readOnly": true, + "format": "uuid", + "type": "string", + "description": "The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity." }, - "required": [ - "type" - ] - }, - "SystemAssignedServiceIdentityType": { - "description": "Type of managed service identity (either system assigned, or none).", - "enum": [ - "None", - "SystemAssigned" - ], - "type": "string", - "x-ms-enum": { - "name": "SystemAssignedServiceIdentityType", - "modelAsString": true + "tenantId": { + "readOnly": true, + "format": "uuid", + "type": "string", + "description": "The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity." + }, + "type": { + "$ref": "#/definitions/SystemAssignedServiceIdentityType" } }, - "SystemAssignedServiceIdentity": { - "description": "Managed service identity (either system assigned, or none)", - "type": "object", - "properties": { - "principalId": { - "readOnly": true, - "format": "uuid", - "type": "string", - "description": "The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity." - }, - "tenantId": { - "readOnly": true, - "format": "uuid", - "type": "string", - "description": "The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity." - }, - "type": { - "$ref": "#/definitions/SystemAssignedServiceIdentityType" - } - }, - "required": [ - "type" - ] - } + "required": ["type"] } - } \ No newline at end of file + } +} diff --git a/swagger/specification/common-types/resource-management/v3/privatelinks.json b/swagger/specification/common-types/resource-management/v3/privatelinks.json index 3678f5c68ed..54de3bbbcf5 100644 --- a/swagger/specification/common-types/resource-management/v3/privatelinks.json +++ b/swagger/specification/common-types/resource-management/v3/privatelinks.json @@ -1,182 +1,171 @@ { - "swagger": "2.0", - "info": { - "version": "3.0", - "title": "Common types" + "swagger": "2.0", + "info": { + "version": "3.0", + "title": "Common types" + }, + "paths": {}, + "definitions": { + "PrivateEndpoint": { + "type": "object", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "The ARM identifier for Private Endpoint" + } + }, + "description": "The Private Endpoint resource." }, - "paths": {}, - "definitions": { - "PrivateEndpoint": { - "type": "object", + "PrivateEndpointConnection": { + "type": "object", + "properties": { "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "The ARM identifier for Private Endpoint" - } - }, - "description": "The Private Endpoint resource." + "$ref": "#/definitions/PrivateEndpointConnectionProperties", + "x-ms-client-flatten": true, + "description": "Resource properties." + } }, - "PrivateEndpointConnection": { - "type": "object", - "properties": { - "properties": { - "$ref": "#/definitions/PrivateEndpointConnectionProperties", - "x-ms-client-flatten": true, - "description": "Resource properties." - } + "allOf": [ + { + "$ref": "./types.json#/definitions/Resource" + } + ], + "description": "The Private Endpoint Connection resource." + }, + "PrivateEndpointConnectionProperties": { + "type": "object", + "properties": { + "privateEndpoint": { + "$ref": "#/definitions/PrivateEndpoint", + "description": "The resource of private end point." }, - "allOf": [ - { - "$ref": "./types.json#/definitions/Resource" - } - ], - "description": "The Private Endpoint Connection resource." - }, - "PrivateEndpointConnectionProperties": { - "type": "object", - "properties": { - "privateEndpoint": { - "$ref": "#/definitions/PrivateEndpoint", - "description": "The resource of private end point." - }, - "privateLinkServiceConnectionState": { - "$ref": "#/definitions/PrivateLinkServiceConnectionState", - "description": "A collection of information about the state of the connection between service consumer and provider." - }, - "provisioningState": { - "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState", - "description": "The provisioning state of the private endpoint connection resource." - } + "privateLinkServiceConnectionState": { + "$ref": "#/definitions/PrivateLinkServiceConnectionState", + "description": "A collection of information about the state of the connection between service consumer and provider." }, - "required": [ - "privateLinkServiceConnectionState" - ], - "description": "Properties of the PrivateEndpointConnectProperties." + "provisioningState": { + "$ref": "#/definitions/PrivateEndpointConnectionProvisioningState", + "description": "The provisioning state of the private endpoint connection resource." + } }, - "PrivateLinkServiceConnectionState": { - "type": "object", - "properties": { - "status": { - "$ref": "#/definitions/PrivateEndpointServiceConnectionStatus", - "description": "Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service." - }, - "description": { - "type": "string", - "description": "The reason for approval/rejection of the connection." - }, - "actionsRequired": { - "type": "string", - "description": "A message indicating if changes on the service provider require any updates on the consumer." - } + "required": ["privateLinkServiceConnectionState"], + "description": "Properties of the PrivateEndpointConnectProperties." + }, + "PrivateLinkServiceConnectionState": { + "type": "object", + "properties": { + "status": { + "$ref": "#/definitions/PrivateEndpointServiceConnectionStatus", + "description": "Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service." }, - "description": "A collection of information about the state of the connection between service consumer and provider." - }, - "PrivateEndpointServiceConnectionStatus": { - "type": "string", - "description": "The private endpoint connection status.", - "enum": [ - "Pending", - "Approved", - "Rejected" - ], - "x-ms-enum": { - "name": "PrivateEndpointServiceConnectionStatus", - "modelAsString": true + "description": { + "type": "string", + "description": "The reason for approval/rejection of the connection." + }, + "actionsRequired": { + "type": "string", + "description": "A message indicating if changes on the service provider require any updates on the consumer." } }, - "PrivateEndpointConnectionProvisioningState": { - "type": "string", - "readOnly": true, - "description": "The current provisioning state.", - "enum": [ - "Succeeded", - "Creating", - "Deleting", - "Failed" - ], - "x-ms-enum": { - "name": "PrivateEndpointConnectionProvisioningState", - "modelAsString": true + "description": "A collection of information about the state of the connection between service consumer and provider." + }, + "PrivateEndpointServiceConnectionStatus": { + "type": "string", + "description": "The private endpoint connection status.", + "enum": ["Pending", "Approved", "Rejected"], + "x-ms-enum": { + "name": "PrivateEndpointServiceConnectionStatus", + "modelAsString": true + } + }, + "PrivateEndpointConnectionProvisioningState": { + "type": "string", + "readOnly": true, + "description": "The current provisioning state.", + "enum": ["Succeeded", "Creating", "Deleting", "Failed"], + "x-ms-enum": { + "name": "PrivateEndpointConnectionProvisioningState", + "modelAsString": true + } + }, + "PrivateLinkResource": { + "type": "object", + "properties": { + "properties": { + "$ref": "#/definitions/PrivateLinkResourceProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true } }, - "PrivateLinkResource": { - "type": "object", - "properties": { - "properties": { - "$ref": "#/definitions/PrivateLinkResourceProperties", - "description": "Resource properties.", - "x-ms-client-flatten": true - } + "allOf": [ + { + "$ref": "./types.json#/definitions/Resource" + } + ], + "description": "A private link resource" + }, + "PrivateLinkResourceProperties": { + "type": "object", + "properties": { + "groupId": { + "description": "The private link resource group id.", + "type": "string", + "readOnly": true }, - "allOf": [ - { - "$ref": "./types.json#/definitions/Resource" - } - ], - "description": "A private link resource" - }, - "PrivateLinkResourceProperties": { - "type": "object", - "properties": { - "groupId": { - "description": "The private link resource group id.", - "type": "string", - "readOnly": true - }, - "requiredMembers": { - "description": "The private link resource required member names.", - "type": "array", - "items": { - "type": "string" - }, - "readOnly": true + "requiredMembers": { + "description": "The private link resource required member names.", + "type": "array", + "items": { + "type": "string" }, - "requiredZoneNames": { - "type": "array", - "items": { - "type": "string" - }, - "description": "The private link resource Private link DNS zone name." - } + "readOnly": true }, - "description": "Properties of a private link resource." + "requiredZoneNames": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The private link resource Private link DNS zone name." + } }, - "PrivateEndpointConnectionListResult": { - "type": "object", - "properties": { - "value": { - "type": "array", - "description": "Array of private endpoint connections", - "items": { - "$ref": "#/definitions/PrivateEndpointConnection" - } + "description": "Properties of a private link resource." + }, + "PrivateEndpointConnectionListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "description": "Array of private endpoint connections", + "items": { + "$ref": "#/definitions/PrivateEndpointConnection" } - }, - "description": "List of private endpoint connection associated with the specified storage account" + } }, - "PrivateLinkResourceListResult": { - "type": "object", - "properties": { - "value": { - "type": "array", - "description": "Array of private link resources", - "items": { - "$ref": "#/definitions/PrivateLinkResource" - } - } - }, - "description": "A list of private link resources" - } + "description": "List of private endpoint connection associated with the specified storage account" }, - "parameters": { - "PrivateEndpointConnectionName": { - "name": "privateEndpointConnectionName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the private endpoint connection associated with the Azure resource", - "x-ms-parameter-location": "method" - } + "PrivateLinkResourceListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "description": "Array of private link resources", + "items": { + "$ref": "#/definitions/PrivateLinkResource" + } + } + }, + "description": "A list of private link resources" + } + }, + "parameters": { + "PrivateEndpointConnectionName": { + "name": "privateEndpointConnectionName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the private endpoint connection associated with the Azure resource", + "x-ms-parameter-location": "method" } - } \ No newline at end of file + } +} diff --git a/swagger/specification/common-types/resource-management/v3/types.json b/swagger/specification/common-types/resource-management/v3/types.json index 102ed73b5aa..0736a8e6ce7 100644 --- a/swagger/specification/common-types/resource-management/v3/types.json +++ b/swagger/specification/common-types/resource-management/v3/types.json @@ -1,667 +1,607 @@ { - "swagger": "2.0", - "info": { - "version": "3.0", - "title": "Common types" - }, - "paths": {}, - "definitions": { - "Resource": { - "title": "Resource", - "description": "Common fields that are returned in the response for all Azure Resource Manager resources", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the resource" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" - }, - "systemData": { - "readOnly": true, - "type": "object", - "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.", - "$ref": "#/definitions/systemData" - } + "swagger": "2.0", + "info": { + "version": "3.0", + "title": "Common types" + }, + "paths": {}, + "definitions": { + "Resource": { + "title": "Resource", + "description": "Common fields that are returned in the response for all Azure Resource Manager resources", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" }, - "x-ms-azure-resource": true - }, - "AzureEntityResource": { - "x-ms-client-name": "AzureEntityResource", - "title": "Entity Resource", - "description": "The resource model definition for an Azure Resource Manager resource with an etag.", - "type": "object", - "properties": { - "etag": { - "type": "string", - "readOnly": true, - "description": "Resource Etag." - } - }, - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "TrackedResource": { - "title": "Tracked Resource", - "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", - "type": "object", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "Resource tags." - }, - "location": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "The geo-location where the resource lives" - } + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the resource" }, - "required": [ - "location" - ], - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ProxyResource": { - "title": "Proxy Resource", - "description": "The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ResourceModelWithAllowedPropertySet": { - "description": "The resource model definition containing the full set of allowed properties for a resource. Except properties bag, there cannot be a top level property outside of this set.", - "type": "object", - "properties": { - "managedBy": { - "type": "string", - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource." - }, - "kind": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource provider must validate and persist this value.", - "pattern": "^[-\\w\\._,\\(\\)]+$" - }, - "etag": { - "readOnly": true, - "type": "string", - "description": "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. " - }, - "identity": { - "allOf": [ - { - "$ref": "#/definitions/Identity" - } - ] - }, - "sku": { - "allOf": [ - { - "$ref": "#/definitions/Sku" - } - ] - }, - "plan": { - "allOf": [ - { - "$ref": "#/definitions/Plan" - } - ] - } - }, - "allOf": [ - { - "$ref": "#/definitions/TrackedResource" - } - ], - "x-ms-azure-resource": true - }, - "SkuTier": { - "type": "string", - "enum": [ - "Free", - "Basic", - "Standard", - "Premium" - ], - "x-ms-enum": { - "name": "SkuTier", - "modelAsString": false - }, - "description": "This field is required to be implemented by the Resource Provider if the service has more than one tier, but is not required on a PUT." - }, - "Sku": { - "description": "The resource model definition representing SKU", - "type": "object", - "properties": { - "name": { - "type": "string", - "description": "The name of the SKU. Ex - P3. It is typically a letter+number code" - }, - "tier": { - "$ref": "#/definitions/SkuTier" - }, - "size": { - "type": "string", - "description": "The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code. " - }, - "family": { - "type": "string", - "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here." - }, - "capacity": { - "type": "integer", - "format": "int32", - "description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted." - } + "type": { + "readOnly": true, + "type": "string", + "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" }, - "required": [ - "name" - ] + "systemData": { + "readOnly": true, + "type": "object", + "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.", + "$ref": "#/definitions/systemData" + } }, - "Identity": { - "description": "Identity for the resource.", - "type": "object", - "properties": { - "principalId": { - "readOnly": true, - "type": "string", - "description": "The principal ID of resource identity." - }, - "tenantId": { - "readOnly": true, - "type": "string", - "description": "The tenant ID of resource." - }, - "type": { - "type": "string", - "description": "The identity type.", - "enum": [ - "SystemAssigned" - ], - "x-ms-enum": { - "name": "ResourceIdentityType", - "modelAsString": false - } - } + "x-ms-azure-resource": true + }, + "AzureEntityResource": { + "x-ms-client-name": "AzureEntityResource", + "title": "Entity Resource", + "description": "The resource model definition for an Azure Resource Manager resource with an etag.", + "type": "object", + "properties": { + "etag": { + "type": "string", + "readOnly": true, + "description": "Resource Etag." } }, - "Plan": { - "type": "object", - "properties": { - "name": { - "type": "string", - "description": "A user defined name of the 3rd Party Artifact that is being procured." - }, - "publisher": { - "type": "string", - "description": "The publisher of the 3rd Party Artifact that is being bought. E.g. NewRelic" - }, - "product": { - "type": "string", - "description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding. " - }, - "promotionCode": { - "type": "string", - "description": "A publisher provided promotion code as provisioned in Data Market for the said product/artifact." + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "TrackedResource": { + "title": "Tracked Resource", + "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" }, - "version": { - "type": "string", - "description": "The version of the desired product/artifact." - } + "x-ms-mutability": ["read", "create", "update"], + "description": "Resource tags." }, - "description": "Plan for the resource.", - "required": [ - "name", - "publisher", - "product" - ] - }, - "ErrorDetail": { - "description": "The error detail.", - "type": "object", - "properties": { - "code": { - "readOnly": true, - "type": "string", - "description": "The error code." - }, - "message": { - "readOnly": true, - "type": "string", - "description": "The error message." - }, - "target": { - "readOnly": true, - "type": "string", - "description": "The error target." - }, - "details": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/ErrorDetail" - }, - "x-ms-identifiers": [ - "message", - "target" - ], - "description": "The error details." - }, - "additionalInfo": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/ErrorAdditionalInfo" - }, - "x-ms-identifiers": [], - "description": "The error additional info." - } + "location": { + "type": "string", + "x-ms-mutability": ["read", "create"], + "description": "The geo-location where the resource lives" } }, - "ErrorResponse": { - "title": "Error response", - "description": "Common error response for all Azure Resource Manager APIs to return error details for failed operations. (This also follows the OData error response format.).", - "type": "object", - "properties": { - "error": { - "description": "The error object.", - "$ref": "#/definitions/ErrorDetail" - } + "required": ["location"], + "allOf": [ + { + "$ref": "#/definitions/Resource" } - }, - "ErrorAdditionalInfo": { - "type": "object", - "properties": { - "type": { - "readOnly": true, - "type": "string", - "description": "The additional info type." - }, - "info": { - "readOnly": true, - "type": "object", - "description": "The additional info." - } + ] + }, + "ProxyResource": { + "title": "Proxy Resource", + "description": "The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ResourceModelWithAllowedPropertySet": { + "description": "The resource model definition containing the full set of allowed properties for a resource. Except properties bag, there cannot be a top level property outside of this set.", + "type": "object", + "properties": { + "managedBy": { + "type": "string", + "x-ms-mutability": ["read", "create", "update"], + "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource." }, - "description": "The resource management error additional info." - }, - "Operation": { - "title": "REST API Operation", - "description": "Details of a REST API operation, returned from the Resource Provider Operations API", - "type": "object", - "properties": { - "name": { - "description": "The name of the operation, as per Resource-Based Access Control (RBAC). Examples: \"Microsoft.Compute/virtualMachines/write\", \"Microsoft.Compute/virtualMachines/capture/action\"", - "type": "string", - "readOnly": true - }, - "isDataAction": { - "description": "Whether the operation applies to data-plane. This is \"true\" for data-plane operations and \"false\" for ARM/control-plane operations.", - "type": "boolean", - "readOnly": true - }, - "display": { - "description": "Localized display information for this particular operation.", - "type": "object", - "properties": { - "provider": { - "description": "The localized friendly form of the resource provider name, e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute\".", - "type": "string", - "readOnly": true - }, - "resource": { - "description": "The localized friendly name of the resource type related to this operation. E.g. \"Virtual Machines\" or \"Job Schedule Collections\".", - "type": "string", - "readOnly": true - }, - "operation": { - "description": "The concise, localized friendly name for the operation; suitable for dropdowns. E.g. \"Create or Update Virtual Machine\", \"Restart Virtual Machine\".", - "type": "string", - "readOnly": true - }, - "description": { - "description": "The short, localized friendly description of the operation; suitable for tool tips and detailed views.", - "type": "string", - "readOnly": true - } + "kind": { + "type": "string", + "x-ms-mutability": ["read", "create"], + "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource provider must validate and persist this value.", + "pattern": "^[-\\w\\._,\\(\\)]+$" + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. " + }, + "identity": { + "allOf": [ + { + "$ref": "#/definitions/Identity" } - }, - "origin": { - "description": "The intended executor of the operation; as in Resource Based Access Control (RBAC) and audit logs UX. Default value is \"user,system\"", - "type": "string", - "readOnly": true, - "enum": [ - "user", - "system", - "user,system" - ], - "x-ms-enum": { - "name": "Origin", - "modelAsString": true + ] + }, + "sku": { + "allOf": [ + { + "$ref": "#/definitions/Sku" } - }, - "actionType": { - "description": "Enum. Indicates the action type. \"Internal\" refers to actions that are for internal only APIs.", - "type": "string", - "readOnly": true, - "enum": [ - "Internal" - ], - "x-ms-enum": { - "name": "ActionType", - "modelAsString": true + ] + }, + "plan": { + "allOf": [ + { + "$ref": "#/definitions/Plan" } - } + ] } }, - "OperationListResult": { - "description": "A list of REST API operations supported by an Azure Resource Provider. It contains an URL link to get the next set of results.", - "type": "object", - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/Operation" - }, - "x-ms-identifiers": [ - "name" - ], - "description": "List of operations supported by the resource provider", - "readOnly": true - }, - "nextLink": { - "type": "string", - "description": "URL to get the next set of operation list results (if there are any).", - "readOnly": true - } + "allOf": [ + { + "$ref": "#/definitions/TrackedResource" } + ], + "x-ms-azure-resource": true + }, + "SkuTier": { + "type": "string", + "enum": ["Free", "Basic", "Standard", "Premium"], + "x-ms-enum": { + "name": "SkuTier", + "modelAsString": false }, - "OperationStatusResult": { - "description": "The current status of an async operation.", - "type": "object", - "required": [ - "status" - ], - "properties": { - "id": { - "description": "Fully qualified ID for the async operation.", - "type": "string" - }, - "name": { - "description": "Name of the async operation.", - "type": "string" - }, - "status": { - "description": "Operation status.", - "type": "string" - }, - "percentComplete": { - "description": "Percent of the operation that is complete.", - "type": "number", - "minimum": 0, - "maximum": 100 - }, - "startTime": { - "description": "The start time of the operation.", - "type": "string", - "format": "date-time" - }, - "endTime": { - "description": "The end time of the operation.", - "type": "string", - "format": "date-time" - }, - "operations": { - "description": "The operations list.", - "type": "array", - "items": { - "$ref": "#/definitions/OperationStatusResult" - } - }, - "error": { - "description": "If present, details of the operation error.", - "$ref": "#/definitions/ErrorDetail" - } + "description": "This field is required to be implemented by the Resource Provider if the service has more than one tier, but is not required on a PUT." + }, + "Sku": { + "description": "The resource model definition representing SKU", + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "The name of the SKU. Ex - P3. It is typically a letter+number code" + }, + "tier": { + "$ref": "#/definitions/SkuTier" + }, + "size": { + "type": "string", + "description": "The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code. " + }, + "family": { + "type": "string", + "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here." + }, + "capacity": { + "type": "integer", + "format": "int32", + "description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted." } }, - "locationData": { - "description": "Metadata pertaining to the geographic location of the resource.", - "type": "object", - "properties": { - "name": { - "type": "string", - "maxLength": 256, - "description": "A canonical name for the geographic or physical location." - }, - "city": { - "type": "string", - "description": "The city or locality where the resource is located." - }, - "district": { - "type": "string", - "description": "The district, state, or province where the resource is located." - }, - "countryOrRegion": { - "type": "string", - "description": "The country or region where the resource is located" + "required": ["name"] + }, + "Identity": { + "description": "Identity for the resource.", + "type": "object", + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal ID of resource identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant ID of resource." + }, + "type": { + "type": "string", + "description": "The identity type.", + "enum": ["SystemAssigned"], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false } + } + } + }, + "Plan": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "A user defined name of the 3rd Party Artifact that is being procured." + }, + "publisher": { + "type": "string", + "description": "The publisher of the 3rd Party Artifact that is being bought. E.g. NewRelic" + }, + "product": { + "type": "string", + "description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding. " }, - "required": [ - "name" - ] + "promotionCode": { + "type": "string", + "description": "A publisher provided promotion code as provisioned in Data Market for the said product/artifact." + }, + "version": { + "type": "string", + "description": "The version of the desired product/artifact." + } }, - "systemData": { - "description": "Metadata pertaining to creation and last modification of the resource.", - "type": "object", - "readOnly": true, - "properties": { - "createdBy": { - "type": "string", - "description": "The identity that created the resource." - }, - "createdByType": { - "type": "string", - "description": "The type of identity that created the resource.", - "enum": [ - "User", - "Application", - "ManagedIdentity", - "Key" - ], - "x-ms-enum": { - "name": "createdByType", - "modelAsString": true - } - }, - "createdAt": { - "type": "string", - "format": "date-time", - "description": "The timestamp of resource creation (UTC)." - }, - "lastModifiedBy": { - "type": "string", - "description": "The identity that last modified the resource." - }, - "lastModifiedByType": { - "type": "string", - "description": "The type of identity that last modified the resource.", - "enum": [ - "User", - "Application", - "ManagedIdentity", - "Key" - ], - "x-ms-enum": { - "name": "createdByType", - "modelAsString": true - } + "description": "Plan for the resource.", + "required": ["name", "publisher", "product"] + }, + "ErrorDetail": { + "description": "The error detail.", + "type": "object", + "properties": { + "code": { + "readOnly": true, + "type": "string", + "description": "The error code." + }, + "message": { + "readOnly": true, + "type": "string", + "description": "The error message." + }, + "target": { + "readOnly": true, + "type": "string", + "description": "The error target." + }, + "details": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDetail" }, - "lastModifiedAt": { - "type": "string", - "format": "date-time", - "description": "The timestamp of resource last modification (UTC)" - } + "x-ms-identifiers": ["message", "target"], + "description": "The error details." + }, + "additionalInfo": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ErrorAdditionalInfo" + }, + "x-ms-identifiers": [], + "description": "The error additional info." + } + } + }, + "ErrorResponse": { + "title": "Error response", + "description": "Common error response for all Azure Resource Manager APIs to return error details for failed operations. (This also follows the OData error response format.).", + "type": "object", + "properties": { + "error": { + "description": "The error object.", + "$ref": "#/definitions/ErrorDetail" + } + } + }, + "ErrorAdditionalInfo": { + "type": "object", + "properties": { + "type": { + "readOnly": true, + "type": "string", + "description": "The additional info type." + }, + "info": { + "readOnly": true, + "type": "object", + "description": "The additional info." } }, - "encryptionProperties": { - "description": "Configuration of key for data encryption", - "type": "object", - "properties": { - "status": { - "description": "Indicates whether or not the encryption is enabled for container registry.", - "enum": [ - "enabled", - "disabled" - ], - "type": "string", - "x-ms-enum": { - "name": "EncryptionStatus", - "modelAsString": true + "description": "The resource management error additional info." + }, + "Operation": { + "title": "REST API Operation", + "description": "Details of a REST API operation, returned from the Resource Provider Operations API", + "type": "object", + "properties": { + "name": { + "description": "The name of the operation, as per Resource-Based Access Control (RBAC). Examples: \"Microsoft.Compute/virtualMachines/write\", \"Microsoft.Compute/virtualMachines/capture/action\"", + "type": "string", + "readOnly": true + }, + "isDataAction": { + "description": "Whether the operation applies to data-plane. This is \"true\" for data-plane operations and \"false\" for ARM/control-plane operations.", + "type": "boolean", + "readOnly": true + }, + "display": { + "description": "Localized display information for this particular operation.", + "type": "object", + "properties": { + "provider": { + "description": "The localized friendly form of the resource provider name, e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute\".", + "type": "string", + "readOnly": true + }, + "resource": { + "description": "The localized friendly name of the resource type related to this operation. E.g. \"Virtual Machines\" or \"Job Schedule Collections\".", + "type": "string", + "readOnly": true + }, + "operation": { + "description": "The concise, localized friendly name for the operation; suitable for dropdowns. E.g. \"Create or Update Virtual Machine\", \"Restart Virtual Machine\".", + "type": "string", + "readOnly": true + }, + "description": { + "description": "The short, localized friendly description of the operation; suitable for tool tips and detailed views.", + "type": "string", + "readOnly": true } - }, - "keyVaultProperties": { - "$ref": "#/definitions/KeyVaultProperties", - "description": "Key vault properties." + } + }, + "origin": { + "description": "The intended executor of the operation; as in Resource Based Access Control (RBAC) and audit logs UX. Default value is \"user,system\"", + "type": "string", + "readOnly": true, + "enum": ["user", "system", "user,system"], + "x-ms-enum": { + "name": "Origin", + "modelAsString": true + } + }, + "actionType": { + "description": "Enum. Indicates the action type. \"Internal\" refers to actions that are for internal only APIs.", + "type": "string", + "readOnly": true, + "enum": ["Internal"], + "x-ms-enum": { + "name": "ActionType", + "modelAsString": true } } - }, - "KeyVaultProperties": { - "type": "object", - "properties": { - "keyIdentifier": { - "description": "Key vault uri to access the encryption key.", - "type": "string" - }, - "identity": { - "description": "The client ID of the identity which will be used to access key vault.", - "type": "string" + } + }, + "OperationListResult": { + "description": "A list of REST API operations supported by an Azure Resource Provider. It contains an URL link to get the next set of results.", + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + }, + "x-ms-identifiers": ["name"], + "description": "List of operations supported by the resource provider", + "readOnly": true + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of operation list results (if there are any).", + "readOnly": true + } + } + }, + "OperationStatusResult": { + "description": "The current status of an async operation.", + "type": "object", + "required": ["status"], + "properties": { + "id": { + "description": "Fully qualified ID for the async operation.", + "type": "string" + }, + "name": { + "description": "Name of the async operation.", + "type": "string" + }, + "status": { + "description": "Operation status.", + "type": "string" + }, + "percentComplete": { + "description": "Percent of the operation that is complete.", + "type": "number", + "minimum": 0, + "maximum": 100 + }, + "startTime": { + "description": "The start time of the operation.", + "type": "string", + "format": "date-time" + }, + "endTime": { + "description": "The end time of the operation.", + "type": "string", + "format": "date-time" + }, + "operations": { + "description": "The operations list.", + "type": "array", + "items": { + "$ref": "#/definitions/OperationStatusResult" } + }, + "error": { + "description": "If present, details of the operation error.", + "$ref": "#/definitions/ErrorDetail" + } + } + }, + "locationData": { + "description": "Metadata pertaining to the geographic location of the resource.", + "type": "object", + "properties": { + "name": { + "type": "string", + "maxLength": 256, + "description": "A canonical name for the geographic or physical location." + }, + "city": { + "type": "string", + "description": "The city or locality where the resource is located." + }, + "district": { + "type": "string", + "description": "The district, state, or province where the resource is located." + }, + "countryOrRegion": { + "type": "string", + "description": "The country or region where the resource is located" } }, - "CheckNameAvailabilityRequest": { - "description": "The check availability request body.", - "type": "object", - "properties": { - "name": { - "description": "The name of the resource for which availability needs to be checked.", - "type": "string" - }, - "type": { - "description": "The resource type.", - "type": "string" + "required": ["name"] + }, + "systemData": { + "description": "Metadata pertaining to creation and last modification of the resource.", + "type": "object", + "readOnly": true, + "properties": { + "createdBy": { + "type": "string", + "description": "The identity that created the resource." + }, + "createdByType": { + "type": "string", + "description": "The type of identity that created the resource.", + "enum": ["User", "Application", "ManagedIdentity", "Key"], + "x-ms-enum": { + "name": "createdByType", + "modelAsString": true + } + }, + "createdAt": { + "type": "string", + "format": "date-time", + "description": "The timestamp of resource creation (UTC)." + }, + "lastModifiedBy": { + "type": "string", + "description": "The identity that last modified the resource." + }, + "lastModifiedByType": { + "type": "string", + "description": "The type of identity that last modified the resource.", + "enum": ["User", "Application", "ManagedIdentity", "Key"], + "x-ms-enum": { + "name": "createdByType", + "modelAsString": true } + }, + "lastModifiedAt": { + "type": "string", + "format": "date-time", + "description": "The timestamp of resource last modification (UTC)" } - }, - "CheckNameAvailabilityResponse": { - "description": "The check availability result.", - "type": "object", - "properties": { - "nameAvailable": { - "description": "Indicates if the resource name is available.", - "type": "boolean" - }, - "reason": { - "description": "The reason why the given name is not available.", - "type": "string", - "enum": [ - "Invalid", - "AlreadyExists" - ], - "x-ms-enum": { - "name": "CheckNameAvailabilityReason", - "modelAsString": true - } - }, - "message": { - "description": "Detailed reason why the given name is available.", - "type": "string" + } + }, + "encryptionProperties": { + "description": "Configuration of key for data encryption", + "type": "object", + "properties": { + "status": { + "description": "Indicates whether or not the encryption is enabled for container registry.", + "enum": ["enabled", "disabled"], + "type": "string", + "x-ms-enum": { + "name": "EncryptionStatus", + "modelAsString": true } + }, + "keyVaultProperties": { + "$ref": "#/definitions/KeyVaultProperties", + "description": "Key vault properties." } } }, - "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "The ID of the target subscription.", - "minLength": 1 - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "The API version to use for this operation.", - "minLength": 1 - }, - "ResourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group. The name is case insensitive.", - "minLength": 1, - "maxLength": 90, - "x-ms-parameter-location": "method" - }, - "OperationIdParameter": { - "name": "operationId", - "in": "path", - "required": true, - "type": "string", - "description": "The ID of an ongoing async operation.", - "minLength": 1, - "x-ms-parameter-location": "method" - }, - "LocationParameter": { - "name": "location", - "in": "path", - "required": true, - "type": "string", - "description": "The name of Azure region.", - "minLength": 1, - "x-ms-parameter-location": "method" + "KeyVaultProperties": { + "type": "object", + "properties": { + "keyIdentifier": { + "description": "Key vault uri to access the encryption key.", + "type": "string" + }, + "identity": { + "description": "The client ID of the identity which will be used to access key vault.", + "type": "string" + } + } + }, + "CheckNameAvailabilityRequest": { + "description": "The check availability request body.", + "type": "object", + "properties": { + "name": { + "description": "The name of the resource for which availability needs to be checked.", + "type": "string" + }, + "type": { + "description": "The resource type.", + "type": "string" + } + } + }, + "CheckNameAvailabilityResponse": { + "description": "The check availability result.", + "type": "object", + "properties": { + "nameAvailable": { + "description": "Indicates if the resource name is available.", + "type": "boolean" + }, + "reason": { + "description": "The reason why the given name is not available.", + "type": "string", + "enum": ["Invalid", "AlreadyExists"], + "x-ms-enum": { + "name": "CheckNameAvailabilityReason", + "modelAsString": true + } + }, + "message": { + "description": "Detailed reason why the given name is available.", + "type": "string" + } } } - } \ No newline at end of file + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The ID of the target subscription.", + "minLength": 1 + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The API version to use for this operation.", + "minLength": 1 + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group. The name is case insensitive.", + "minLength": 1, + "maxLength": 90, + "x-ms-parameter-location": "method" + }, + "OperationIdParameter": { + "name": "operationId", + "in": "path", + "required": true, + "type": "string", + "description": "The ID of an ongoing async operation.", + "minLength": 1, + "x-ms-parameter-location": "method" + }, + "LocationParameter": { + "name": "location", + "in": "path", + "required": true, + "type": "string", + "description": "The name of Azure region.", + "minLength": 1, + "x-ms-parameter-location": "method" + } + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_CreateOrUpdate.json index 9b13d6016a0..e4164707ac1 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_CreateOrUpdate.json @@ -1,53 +1,53 @@ { - "operationId": "AwsCredentials_CreateOrUpdate", - "title": "Create or update an AWS AccessKey credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "aws", - "credentialName": "default", - "Credential": { - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "accessKeyId": "enterAccessKeyIdHere", - "secretAccessKey": "enterSecretAccessKey", - "storage": { - "kind": "Internal" - } - } + "operationId": "AwsCredentials_CreateOrUpdate", + "title": "Create or update an AWS AccessKey credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "aws", + "credentialName": "default", + "Credential": { + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "accessKeyId": "enterAccessKeyIdHere", + "secretAccessKey": "enterSecretAccessKey", + "storage": { + "kind": "Internal" } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } + } + } }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - }, - "201": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "201": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Delete.json index c0e5bdb0673..c84b7185b14 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Delete.json @@ -1,14 +1,14 @@ { - "operationId": "AwsCredentials_Delete", - "title": "Delete an AWS AccessKey credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud", - "credentialName": "default" - }, - "responses": { - "200": {}, - "204": {} - } -} \ No newline at end of file + "operationId": "AwsCredentials_Delete", + "title": "Delete an AWS AccessKey credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud", + "credentialName": "default" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Get.json index 91d728e6f1f..a73e93746d1 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Get.json @@ -1,27 +1,27 @@ { - "operationId": "AwsCredentials_Get", - "title": "Get an AWS AccessKey credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud", - "credentialName": "default" - }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "operationId": "AwsCredentials_Get", + "title": "Get an AWS AccessKey credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud", + "credentialName": "default" + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_List.json index e89535b7fa5..ff9d1c8ce43 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_List.json @@ -1,30 +1,30 @@ { - "operationId": "AwsCredentials_List", - "title": "List AWS AccessKey credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - ] + "operationId": "AwsCredentials_List", + "title": "List AWS AccessKey credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } - } + } + ] + } } -} \ No newline at end of file + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Update.json index 37a1cb337e1..d6a599c0f22 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_AccessKey_Update.json @@ -1,53 +1,53 @@ { - "operationId": "AwsCredentials_Update", - "title": "Update an AWS AccessKey credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "aws", - "credentialName": "default", - "Credential": { - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "accessKeyId": "enterAccessKeyIdHere", - "secretAccessKey": "enterSecretAccessKey", - "storage": { - "kind": "Internal" - } - } + "operationId": "AwsCredentials_Update", + "title": "Update an AWS AccessKey credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "aws", + "credentialName": "default", + "Credential": { + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "accessKeyId": "enterAccessKeyIdHere", + "secretAccessKey": "enterSecretAccessKey", + "storage": { + "kind": "Internal" } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } + } + } }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - }, - "201": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "201": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_CreateOrUpdate.json index f59f7e6f14a..91c81314e58 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_CreateOrUpdate.json @@ -1,54 +1,54 @@ { - "operationId": "AwsCredentials_CreateOrUpdate", - "title": "Create or update an AWS IRSA credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "aws", - "credentialName": "default", - "Credential": { - "location": "us-west-2", - "properties": { - "kind": "IRSA", - "roleARN": "enterRoleARN", - "storage": { - "kind": "Internal" - } - } + "operationId": "AwsCredentials_CreateOrUpdate", + "title": "Create or update an AWS IRSA credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "aws", + "credentialName": "default", + "Credential": { + "location": "us-west-2", + "properties": { + "kind": "IRSA", + "roleARN": "enterRoleARN", + "storage": { + "kind": "Internal" } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "IRSA", + "roleARN": "enterRoleARN", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } + } + } }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "IRSA", - "roleARN": "enterRoleARN", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - }, - "201": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "IRSA", - "roleARN": "enterRoleARN", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "201": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "IRSA", + "roleARN": "enterRoleARN", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Delete.json index ceda0d303b1..9ec32c5255c 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Delete.json @@ -1,14 +1,14 @@ { - "operationId": "AwsCredentials_Delete", - "title": "Delete an AWS IRSA credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud", - "credentialName": "default" - }, - "responses": { - "200": {}, - "204": {} - } -} \ No newline at end of file + "operationId": "AwsCredentials_Delete", + "title": "Delete an AWS IRSA credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud", + "credentialName": "default" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Get.json index adf56c6949b..9bfc60457b0 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Get.json @@ -1,28 +1,28 @@ { - "operationId": "AwsCredentials_Get", - "title": "Get an AWS IRSA credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud", - "credentialName": "default" - }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "IRSA", - "roleArn": "enterRoleARN", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "operationId": "AwsCredentials_Get", + "title": "Get an AWS IRSA credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud", + "credentialName": "default" + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "IRSA", + "roleArn": "enterRoleARN", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_List.json index da727860c8e..da09a3cc2cc 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_List.json @@ -1,31 +1,31 @@ { - "operationId": "AwsCredentials_List", - "title": "List AWS IRSA credentials", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "IRSA", - "roleArn": "enterRoleARN", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - ] + "operationId": "AwsCredentials_List", + "title": "List AWS IRSA credentials", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "IRSA", + "roleArn": "enterRoleARN", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } - } + } + ] + } } -} \ No newline at end of file + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Update.json index b6497af3e40..94ef1474c1f 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_IRSA_Update.json @@ -51,4 +51,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_List.json index bd11cb7df23..8e6771d4bbe 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_List.json @@ -1,30 +1,30 @@ { - "operationId": "AwsCredentials_List", - "title": "List AWS credentials", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - ] + "operationId": "AwsCredentials_List", + "title": "List AWS credentials", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } - } + } + ] + } } -} \ No newline at end of file + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_Update.json index f636c77d2fb..a1f970d1682 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AWSCredential_Update.json @@ -1,53 +1,53 @@ { - "operationId": "AwsCredentials_Update", - "title": "Update an AWS credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "aws", - "credentialName": "default", - "Credential": { - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "accessKeyId": "enterAccessKeyIdHere", - "secretAccessKey": "enterSecretAccessKey", - "storage": { - "kind": "Internal" - } - } + "operationId": "AwsCredentials_Update", + "title": "Update an AWS credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "aws", + "credentialName": "default", + "Credential": { + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "accessKeyId": "enterAccessKeyIdHere", + "secretAccessKey": "enterSecretAccessKey", + "storage": { + "kind": "Internal" } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } + } + } }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - }, - "201": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "201": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_CreateOrUpdate.json index 9588c4dd763..a998925356e 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_CreateOrUpdate.json @@ -35,4 +35,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_Delete.json index 4bedace3503..a9c7a162553 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_Delete.json @@ -18,4 +18,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_Get.json index c12de83dd0e..45d78399746 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_Get.json @@ -20,4 +20,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_List.json index 358a3274f6e..a5bb23bbbb6 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ApiVersions_List.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsCredentials_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsCredentials_Update.json index 8d5aacc379e..6e953700ba4 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsCredentials_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsCredentials_Update.json @@ -1,53 +1,53 @@ { - "operationId": "AwsCredentials_Update", - "title": "Update a AWS credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "aws", - "credentialName": "default", - "Credential": { - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "accessKeyId": "enterAccessKeyIdHere", - "secretAccessKey": "enterSecretAccessKey", - "storage": { - "kind": "Internal" - } - } + "operationId": "AwsCredentials_Update", + "title": "Update a AWS credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "aws", + "credentialName": "default", + "Credential": { + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "accessKeyId": "enterAccessKeyIdHere", + "secretAccessKey": "enterSecretAccessKey", + "storage": { + "kind": "Internal" } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } + } + } }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - }, - "201": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "201": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_CreateOrUpdate.json index 45a5e77d9bd..017683e30d0 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_CreateOrUpdate.json @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Delete.json index 3c9da1db661..9d747e812e6 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Delete.json @@ -9,4 +9,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Get.json index 25bedd954c9..bad472c6296 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Get.json @@ -18,4 +18,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_List.json index 6329ebc6d5f..b5b293493dc 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_List.json @@ -21,4 +21,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Update.json index 9830df25ba0..bb59a7abb88 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AwsPlanes_Update.json @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_CreateOrUpdate.json index 0742ef8e967..f58cd1d517f 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_CreateOrUpdate.json @@ -31,7 +31,7 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -47,11 +47,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Delete.json index 26330012f65..a75a902a17f 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Delete.json @@ -11,4 +11,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Get.json index 23e6142ad6d..e85df6aa0d8 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Get.json @@ -19,11 +19,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_List.json index 0238221ca5b..3a212b7ad6d 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_List.json @@ -20,8 +20,8 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_CreateOrUpdate.json index bd265833c8f..0e4052e4652 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_CreateOrUpdate.json @@ -31,7 +31,7 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -47,11 +47,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Delete.json index 1be9794e92e..580449ea99a 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Delete.json @@ -11,4 +11,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Get.json index 630257a9270..4d123f5b45b 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Get.json @@ -19,11 +19,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_List.json index 037785e4b49..11c854b89bf 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_List.json @@ -20,8 +20,8 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Update.json index 4a45fccfc15..eaff3a06049 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_ServicePrincipal_Update.json @@ -31,7 +31,7 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -47,11 +47,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Update.json index 5db043a3019..ef20bb5aec9 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_Update.json @@ -31,7 +31,7 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -47,11 +47,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_CreateOrUpdate.json index 64a1cfe8e8f..d039ddcb80c 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_CreateOrUpdate.json @@ -29,7 +29,7 @@ "kind": "WorkloadIdentity", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -44,11 +44,11 @@ "kind": "WorkloadIdentity", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Delete.json index cd93a9d61a0..f51d775a40d 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Delete.json @@ -11,4 +11,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Get.json index 30d10597555..2c6981a6019 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Get.json @@ -19,11 +19,11 @@ "clientId": "00000000-0000-0000-0000-000000000000", "tenantId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_List.json index 014d17965d0..ffc4ef409dd 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_List.json @@ -20,8 +20,8 @@ "clientId": "00000000-0000-0000-0000-000000000000", "tenantId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Update.json index 3dc540a8f2e..2de65e1450e 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredential_WorkloadIdentity_Update.json @@ -30,7 +30,7 @@ "clientId": "00000000-0000-0000-0000-000000000000", "tenantId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -46,11 +46,11 @@ "clientId": "00000000-0000-0000-0000-000000000000", "tenantId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_CreateOrUpdate.json index e86d26fb194..09fdee2ca36 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_CreateOrUpdate.json @@ -31,7 +31,7 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -47,11 +47,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Delete.json index 87273e65abf..ac74f341057 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Delete.json @@ -11,4 +11,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Get.json index 98b292f7aa0..1dc11385619 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Get.json @@ -19,11 +19,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_List.json index 0238221ca5b..3a212b7ad6d 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_List.json @@ -20,8 +20,8 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Update.json index 8e468ac5f5f..9e0ab42089e 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzureCredentials_Update.json @@ -31,7 +31,7 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -47,11 +47,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_CreateOrUpdate.json index b1eebcf4d0a..474a3f5be35 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_CreateOrUpdate.json @@ -26,4 +26,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Delete.json index 26961e2752e..a1dbada3852 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Delete.json @@ -9,4 +9,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Get.json index 7d195311b72..95a8fe000cf 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Get.json @@ -19,4 +19,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_List.json index e5cde8db4e5..e816f85bb9e 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_List.json @@ -22,4 +22,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Update.json index ade2edfc1e1..0087f065d1f 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/AzurePlanes_Update.json @@ -26,4 +26,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_CreateOrUpdate.json index a96ce299861..d707cb02250 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_CreateOrUpdate.json @@ -40,4 +40,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_Delete.json index 0ed0275bfbe..d259e84eaf8 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_Delete.json @@ -17,4 +17,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_Get.json index 63694b8ba90..b38fec3e94d 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_Get.json @@ -20,4 +20,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_List.json index a5c18106fa1..f9305b5e3ae 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Locations_List.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Planes_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Planes_List.json index 919ae68102e..9e9a81cdae1 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Planes_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Planes_List.json @@ -26,4 +26,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_CreateOrUpdate.json index 0c1a4b6e02d..9458528a4de 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_CreateOrUpdate.json @@ -30,4 +30,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Delete.json index c3cd0f69fbf..85ebd569230 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Delete.json @@ -9,4 +9,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Get.json index f087e41526b..f8e50968f76 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Get.json @@ -22,4 +22,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_List.json index e81407a2eb3..3713b9e63b8 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_List.json @@ -25,4 +25,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Update.json index 8c7f46843b7..633511bf6bf 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/RadiusPlanes_Update.json @@ -30,4 +30,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_CreateOrUpdate.json index 88a80d36331..1dddcb1bfb3 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_CreateOrUpdate.json @@ -30,4 +30,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Delete.json index a6e1366c626..4bed23caf49 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Delete.json @@ -11,4 +11,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Get.json index 4eab6c512b0..cb3cfef812f 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Get.json @@ -16,4 +16,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_List.json index 50b43e8f8ac..c5744e516c2 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_List.json @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Update.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Update.json index dae569f6d77..7d9d9b38e54 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Update.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceGroups_Update.json @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_CreateOrUpdate.json index 402f2fe4dc6..6f911664e89 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_CreateOrUpdate.json @@ -26,7 +26,7 @@ "id": "/planes/radius/local/providers/System.Resources/resourceProviders/Applications.Test", "name": "Applications.Test", "type": "System.Resources/resourceProviders", - "location": "global", + "location": "global", "properties": { "provisioningState": "Succeeded" } @@ -37,4 +37,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_Delete.json index 0d60fc0c090..2b5539c14a4 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_Delete.json @@ -16,4 +16,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_Get.json index f6ea02f51f1..2da510131cb 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_Get.json @@ -19,4 +19,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_GetProviderSummary.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_GetProviderSummary.json index 5d96e685820..c92648028d1 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_GetProviderSummary.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_GetProviderSummary.json @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_List.json index 4c9fbf0003d..31c40be8156 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_List.json @@ -21,4 +21,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_ListProviderSummaries.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_ListProviderSummaries.json index 71f71e262dc..5efc181bc32 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_ListProviderSummaries.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceProviders_ListProviderSummaries.json @@ -27,4 +27,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_CreateOrUpdate.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_CreateOrUpdate.json index 92aa7108c21..a5068c19d31 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_CreateOrUpdate.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_CreateOrUpdate.json @@ -40,4 +40,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_Delete.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_Delete.json index 00212013d49..af3f9ac10c3 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_Delete.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_Delete.json @@ -17,4 +17,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_Get.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_Get.json index b3c29e5b519..2a5cc266ade 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_Get.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_Get.json @@ -20,4 +20,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_List.json index f77af4c566c..a7b11b87c02 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/ResourceTypes_List.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Resources_List.json b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Resources_List.json index 3856e126bac..90c3967ba70 100644 --- a/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Resources_List.json +++ b/swagger/specification/ucp/resource-manager/UCP/preview/2023-10-01-preview/examples/Resources_List.json @@ -1,28 +1,28 @@ { - "operationId": "Resources_List", - "title": "List resources in a resource group.", - "parameters": { - "api-version": "2023-10-01-preview", - "planeName": "local", - "planeType": "radius", - "resourceGroupName": "rg1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/planes/radius/local/resourcegroups/rg1/providers/Applications.Core/containers/my-container", - "name": "my-container", - "type": "Applications.Core/containers" - }, - { - "id": "/planes/radius/local/resourcegroups/rg1/providers/Applications.Core/applications/my-application", - "name": "my-application", - "type": "Applications.Core/applications" - } - ] - } + "operationId": "Resources_List", + "title": "List resources in a resource group.", + "parameters": { + "api-version": "2023-10-01-preview", + "planeName": "local", + "planeType": "radius", + "resourceGroupName": "rg1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/planes/radius/local/resourcegroups/rg1/providers/Applications.Core/containers/my-container", + "name": "my-container", + "type": "Applications.Core/containers" + }, + { + "id": "/planes/radius/local/resourcegroups/rg1/providers/Applications.Core/applications/my-application", + "name": "my-application", + "type": "Applications.Core/applications" + } + ] } } - } \ No newline at end of file + } +} diff --git a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli.json b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli.json index b31b4de32b4..6525056c545 100644 --- a/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli.json +++ b/test/functional-portable/cli/noncloud/testdata/corerp-kubernetes-cli.json @@ -62,9 +62,7 @@ } } }, - "dependsOn": [ - "app" - ] + "dependsOn": ["app"] }, "containerb": { "import": "radius", @@ -79,9 +77,7 @@ } } }, - "dependsOn": [ - "app" - ] + "dependsOn": ["app"] } } -} \ No newline at end of file +} diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application-graph-out.json b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application-graph-out.json index 1ca37f9efde..aec75fbeadc 100644 --- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application-graph-out.json +++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-application-graph-out.json @@ -77,4 +77,4 @@ "provisioningState": "Succeeded", "type": "Applications.Core/containers" } -] \ No newline at end of file +] diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/parameters/test-tls-cert.parameters.json b/test/functional-portable/corerp/noncloud/resources/testdata/parameters/test-tls-cert.parameters.json index 23dc99fbb20..1d7bf3b21e4 100644 --- a/test/functional-portable/corerp/noncloud/resources/testdata/parameters/test-tls-cert.parameters.json +++ b/test/functional-portable/corerp/noncloud/resources/testdata/parameters/test-tls-cert.parameters.json @@ -1,12 +1,12 @@ { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "tlscrt": { - "value": "-----BEGIN CERTIFICATE-----\nMIIFljCCA34CCQCClM1GARh19zANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgMAldBMRAwDgYDVQQHDAdSZWRtb25kMRIwEAYDVQQKDAlNaWNy\nb3NvZnQxDjAMBgNVBAsMBUF6dXJlMRIwEAYDVQQDDAlsb2NhbGhvc3QxJjAkBgkq\nhkiG9w0BCQEWF3dpbGxzbWl0aEBtaWNyb3NvZnQuY29tMB4XDTIzMDQyNDA0MDcy\nM1oXDTI0MDQyMzA0MDcyM1owgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJXQTEQ\nMA4GA1UEBwwHUmVkbW9uZDESMBAGA1UECgwJTWljcm9zb2Z0MQ4wDAYDVQQLDAVB\nenVyZTESMBAGA1UEAwwJbG9jYWxob3N0MSYwJAYJKoZIhvcNAQkBFhd3aWxsc21p\ndGhAbWljcm9zb2Z0LmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB\nAK/QDR+Cqaoi/q5Yv8vibcGyxVAEUSX6Szv1Vzr5ai0tDIUVjt9OjDRooyF/i2Zo\nkBlu/zqaC0/ICmjLXrpwgmAA/lyTLH5wM8rEEOygGWA0pP3g69/7dBBHcnlIX621\ntaJUzcZNugiQgWsvhALKmrPbPwklROUz3axT87jipCXwFwhPAZbPvG/O/T8dg27i\nL2g+x2bZnXYBNsOWUgbfyL/GC8AxxZK4WTL+FBBtKWBIAcrrsj0Adr1ByQ917sMG\nrIpgcH3pGjkw3mjQBURvMEfn8b8GTi14JogXCHNclJT9IqT4P8gTGsR5SeAuJ1LZ\nILwRPl6FCIw4m/BH9ym61npdJYgyzG6CCZ1L6xjh0d7lI/IiEMP1REFPtx5pJxtF\ntLQ1W8Vv/7Z4fka++I3HAzju/My+DwJ+R/lE/+jth6V5Zgc604CDFoph35g5e0Qs\nzKFWr4Xlvx5V6p9mkaA1KrfOfOhvn6YQVaTqYFFg7BbcTWRFPoNpwUrgX4ArxSUK\ngd96jLqocfYE43wEcds31RSDwtrMJoANn+dyHX4YbW/fKBI6bsCZHen45JAUWiUy\nBSZgbTO9mvcBWpNnD1kmhpE0s1ufTn2RY2xMN2j5oEeif5RT7Pl3C74UPnN0CXRb\nk8uOrw7kZ4NHDh9O70UDdgCw2m/xVA4U1etdZ5/FTqanAgMBAAEwDQYJKoZIhvcN\nAQELBQADggIBAKtjf3l8yIFPocb60VOoQjTsEp+eU77hodFro1F8LQ7ZNDaOi4cN\nu1D8pbyUi/zXMqLsLtRsZ9Vj43VM56QXeod2QyxMMnW9+fmlCXzOJNw1wHE10Era\nFC54Nfq6YI3CYE/f4EL+JHq1ch9+7TRKtAuavrmTmzmVodpU+/mhNiBPEe/OAfEO\nbwhauoqO7B8UJiggDufkgim4FoAjQWuKDPWA3uF5CY+yGKvoEAG0Fn67tygBfEbD\n3FIjnoYvl1LjvN9ZvIByl6RnVXX8IinhsU87Aj5ZTkX1sZ5XYGR7Gw1XPWRgNdaE\nVbk0x2t2mp1DVp/y/ixLLrC0LmuDor8JEST72CZxLrMIcuJeg3wWS+btN4IRKzr2\nRQlX2+CQd7gSFYNA0/ZGuGCo3Bme1p2DhEkzuwweSC9Fw1L09RZtbsc0TLHC4mvf\nSOcYWDuSrLdhj21nlEuvyVxFsGnUD5esQ+2Kfma6Ceg7vQC2jKqomZ28Nwmnetx7\nfyQ1Y5eGleXKA+s02/4zEXGV1ygWxk3CSKxa+4oEcJtE1gxrSqsSe+FgIDft8IC1\nPEVTd8pOTr2gHhBVFIkGo5C68JKe6nV/OKTNWn0xLVZvUIrdAhppcH/Jd7nmdSt8\npZkXJkkM7IR9cHCXHkGDl1grgfDSqlas4Y4ClJkiKjsKwP75RodNsD4H\n-----END CERTIFICATE-----\n" - }, - "tlskey": { - "value": "-----BEGIN PRIVATE KEY-----\nMIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQCv0A0fgqmqIv6u\nWL/L4m3BssVQBFEl+ks79Vc6+WotLQyFFY7fTow0aKMhf4tmaJAZbv86mgtPyApo\ny166cIJgAP5ckyx+cDPKxBDsoBlgNKT94Ovf+3QQR3J5SF+ttbWiVM3GTboIkIFr\nL4QCypqz2z8JJUTlM92sU/O44qQl8BcITwGWz7xvzv0/HYNu4i9oPsdm2Z12ATbD\nllIG38i/xgvAMcWSuFky/hQQbSlgSAHK67I9AHa9QckPde7DBqyKYHB96Ro5MN5o\n0AVEbzBH5/G/Bk4teCaIFwhzXJSU/SKk+D/IExrEeUngLidS2SC8ET5ehQiMOJvw\nR/cputZ6XSWIMsxuggmdS+sY4dHe5SPyIhDD9URBT7ceaScbRbS0NVvFb/+2eH5G\nvviNxwM47vzMvg8Cfkf5RP/o7YeleWYHOtOAgxaKYd+YOXtELMyhVq+F5b8eVeqf\nZpGgNSq3znzob5+mEFWk6mBRYOwW3E1kRT6DacFK4F+AK8UlCoHfeoy6qHH2BON8\nBHHbN9UUg8LazCaADZ/nch1+GG1v3ygSOm7AmR3p+OSQFFolMgUmYG0zvZr3AVqT\nZw9ZJoaRNLNbn059kWNsTDdo+aBHon+UU+z5dwu+FD5zdAl0W5PLjq8O5GeDRw4f\nTu9FA3YAsNpv8VQOFNXrXWefxU6mpwIDAQABAoICAExO0/NSRgu3Zq0LjiuTGqpQ\nyn1Bcms2aMMcaIELUj9LZzy4L6vSrt3scKmQb1PCnJC9cX/g7nnxTDtR0crAHIZI\nyB4sLsquLnyafvIFRx5PmzEqF5a+0BBkwlXLyONfk/diMXIZuF4RQmrgU77WazEX\nPxPcHjwRN+yc/5LGpBJnU8fiasEnZxVsVNS5HZvaBlOLtAZ6+3IFctyPeQjMxpge\nAGmp8KQO6YBNcS30A1prxoNpq5H4ipD4ZakVOc1iLy9cTlcH/r7F7DK33yFl1SHQ\nlUehF/t6Q9cbkCpqC39jI09RBHX1fM+8CQmJXr4Bych2/4gM27notB4lTizJkF8R\nnY+O9VqjqdXevV0PFxc3gdUsYMvMDN5wv1o+JxtWkDrVjA0f3GlpxJk0Gvqsj8La\niagaisYXHk+EpFwFMyBMdm3RQ+JjjVTPNDCdBhW+5dTtuU9KD+lF9Gv5s75iQyUD\nhABMlvyG2RM/3KLqNdixBh3SV5qrD/CF09UxRMwvAloFwzAWBPPzqcHL6ZPKj4ET\nuvxKEcg27dycCaLQ5tzIDQo59sbT5akAoAMI5tpOx5r5tYSdE9DxFGy8nQCBxbXa\nn8AyHMN1Zu1LvxnD+WC4YRYMuKEQdNR123lf/96tO/74a0p/c4zx2seD36VVFmYQ\nLNUP5zlkoAwEQxIqXqe5AoIBAQDbQmO9iw2DA1CL3ZWaftJUgqKPxmmVrkL7DHsN\nwGUVcs7+8YZ1Xkc/JFj5wsFV56EN9naNOJuzfOEya3KSeGsR2pjBNPSlDgacEbJX\nta9LXbnsD+rmrI5tNmD7YUTzTDrIbS87TZnIgetP/U04NpFhiMCk7Gh3aNDAYnI3\nJ8xdTkcZV/BKv8+MrIpnlloGl+v4A1pQXFWy2f2p3mvY0WalnzTCM/EUHzbWGYBR\n/uGxhelpZs4ZzpLrZsYxAi96/yavS+zY5sHNy4zT7bkBaRdf4TLvfe1PRXxMQsPS\nfqpPUxyuIB2PmMoZulkFQRnupqbV2V0O03cF8bI0SSc7Ck8DAoIBAQDNRexEd9cn\nnAsHP5AJSYrhkKn9o/+qYKENDouVfe+QuvwC2NkJ7zn6vUl/zUbRCsA492jBcFQu\ndnjSNI3inQ+WRjGBB2NvqXSRMPqLKQOBsBmqoMjIvR+w/3cJFZcY2iXhpeMeyAaO\n5Ku51UxLQvRbyt5RqI624yZrcJgVe2m5VmWzX2o++qmAYU1FGMczYx92hFPvFffp\nxUdDqKP6UFLH9V1P5sf4um/eYFzaO+pYD8S+EdU5KiRXR13bIOhFNUBF3mvHgOjq\nJ26NUR3bVXd4EgPsAEL2qdF5pjZvZJaBQyf+OnrnqD7bV2FSaKJAF7Cy2RFCGIpa\nDdd5R5ihJ7aNAoIBAQCeJUaXokI+qxdfqpWLd8nxVsA1/6CMa8K4HQpsosbGL6cJ\nz99xrGyrKGZcz5JvicBqt8hOl/QGBB7SJRngd6aSnB7tzGpg2rr9uu3twYgMTjAa\nCmkdtHyOXViaOFBpRCRqCAa3OYOgUcUOTt9xmjpGJUL+Md4vspRPDzLegYAwFJPH\nvdv9rlffWVwC1zlb5Bw5KQHtUIwnkoAaE+mp22+0Kh79rEVIhDMjPgWGHtdfGf1/\nHr2tc4gY7mopUzA4AO1AJv1QfTBwZU7QVXjJgalwaJg6kZOnR7EduFJR8zaYPJRF\nK7jmqAetgvFOjuRLdDyFpmAun2wMB4bHm7QGK6tNAoIBAQCq0B+uTeb87+2BZ5Qt\nFkR6NQ4voTOTjHsXyV2/1R7v2ZjxqY7ZpHcjvjWWIrRmKUMRZFeIeDekvjMGAHN8\n+mNJEjoJe6Nz/JeiZhZmjId9eJOzF75cxHvFpp9gMNYd+RGCtq7LI3nJmGGJ7wNg\nsWNzqtnbK58uctC6oOP9JEgy0MEqRSC9LYq06MMK13aTvU0mKzFJB4fXwLDvjTp+\nhi6MdBHk9k67HDEQ5DD/7NGx29VEsMQ0oGvDMQDZ4oVFae2E9nPLfOrURmHJOJHW\nvUT/5kXbMdCHP4Kvbu9nPFW9VKvH8tPpR2iezxSOJcG2AcCo4tZooNEn5NLD+h75\nI3nVAoIBAHdexvaYQGLWD2r6LjYRp7GueRHXVfpeP3Lc1PXSwiRnGB8Qn4pqONg5\nj0MXrVYhAq/X3Z1/cd17JwZpxqp/1hcbbwlsoASeFaU9i43tU3EDF0Qt1hIpXqxG\nWfmb58ft2hcT12WspyxfaMspECtsJt6dg1VHaulQ+fEln4rT2yxHqsnrU8li9NPp\n5E5OE4xqnuisvqaNk146hMQuXHpULVg8B3cVnMFSSgxqMUkNiHzNlm+TFpTihdlo\nnlcRKVtRuPtUOsP4gcJ9MoOEkxMqQQLFUPJDGDfgxNCsnnt9twIWa9aJDi36NObc\n+Cp2E4G9rjnFoab/Fs9mEVUGUl6N0mA=\n-----END PRIVATE KEY-----\n" - } + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "tlscrt": { + "value": "-----BEGIN CERTIFICATE-----\nMIIFljCCA34CCQCClM1GARh19zANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgMAldBMRAwDgYDVQQHDAdSZWRtb25kMRIwEAYDVQQKDAlNaWNy\nb3NvZnQxDjAMBgNVBAsMBUF6dXJlMRIwEAYDVQQDDAlsb2NhbGhvc3QxJjAkBgkq\nhkiG9w0BCQEWF3dpbGxzbWl0aEBtaWNyb3NvZnQuY29tMB4XDTIzMDQyNDA0MDcy\nM1oXDTI0MDQyMzA0MDcyM1owgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJXQTEQ\nMA4GA1UEBwwHUmVkbW9uZDESMBAGA1UECgwJTWljcm9zb2Z0MQ4wDAYDVQQLDAVB\nenVyZTESMBAGA1UEAwwJbG9jYWxob3N0MSYwJAYJKoZIhvcNAQkBFhd3aWxsc21p\ndGhAbWljcm9zb2Z0LmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB\nAK/QDR+Cqaoi/q5Yv8vibcGyxVAEUSX6Szv1Vzr5ai0tDIUVjt9OjDRooyF/i2Zo\nkBlu/zqaC0/ICmjLXrpwgmAA/lyTLH5wM8rEEOygGWA0pP3g69/7dBBHcnlIX621\ntaJUzcZNugiQgWsvhALKmrPbPwklROUz3axT87jipCXwFwhPAZbPvG/O/T8dg27i\nL2g+x2bZnXYBNsOWUgbfyL/GC8AxxZK4WTL+FBBtKWBIAcrrsj0Adr1ByQ917sMG\nrIpgcH3pGjkw3mjQBURvMEfn8b8GTi14JogXCHNclJT9IqT4P8gTGsR5SeAuJ1LZ\nILwRPl6FCIw4m/BH9ym61npdJYgyzG6CCZ1L6xjh0d7lI/IiEMP1REFPtx5pJxtF\ntLQ1W8Vv/7Z4fka++I3HAzju/My+DwJ+R/lE/+jth6V5Zgc604CDFoph35g5e0Qs\nzKFWr4Xlvx5V6p9mkaA1KrfOfOhvn6YQVaTqYFFg7BbcTWRFPoNpwUrgX4ArxSUK\ngd96jLqocfYE43wEcds31RSDwtrMJoANn+dyHX4YbW/fKBI6bsCZHen45JAUWiUy\nBSZgbTO9mvcBWpNnD1kmhpE0s1ufTn2RY2xMN2j5oEeif5RT7Pl3C74UPnN0CXRb\nk8uOrw7kZ4NHDh9O70UDdgCw2m/xVA4U1etdZ5/FTqanAgMBAAEwDQYJKoZIhvcN\nAQELBQADggIBAKtjf3l8yIFPocb60VOoQjTsEp+eU77hodFro1F8LQ7ZNDaOi4cN\nu1D8pbyUi/zXMqLsLtRsZ9Vj43VM56QXeod2QyxMMnW9+fmlCXzOJNw1wHE10Era\nFC54Nfq6YI3CYE/f4EL+JHq1ch9+7TRKtAuavrmTmzmVodpU+/mhNiBPEe/OAfEO\nbwhauoqO7B8UJiggDufkgim4FoAjQWuKDPWA3uF5CY+yGKvoEAG0Fn67tygBfEbD\n3FIjnoYvl1LjvN9ZvIByl6RnVXX8IinhsU87Aj5ZTkX1sZ5XYGR7Gw1XPWRgNdaE\nVbk0x2t2mp1DVp/y/ixLLrC0LmuDor8JEST72CZxLrMIcuJeg3wWS+btN4IRKzr2\nRQlX2+CQd7gSFYNA0/ZGuGCo3Bme1p2DhEkzuwweSC9Fw1L09RZtbsc0TLHC4mvf\nSOcYWDuSrLdhj21nlEuvyVxFsGnUD5esQ+2Kfma6Ceg7vQC2jKqomZ28Nwmnetx7\nfyQ1Y5eGleXKA+s02/4zEXGV1ygWxk3CSKxa+4oEcJtE1gxrSqsSe+FgIDft8IC1\nPEVTd8pOTr2gHhBVFIkGo5C68JKe6nV/OKTNWn0xLVZvUIrdAhppcH/Jd7nmdSt8\npZkXJkkM7IR9cHCXHkGDl1grgfDSqlas4Y4ClJkiKjsKwP75RodNsD4H\n-----END CERTIFICATE-----\n" + }, + "tlskey": { + "value": "-----BEGIN PRIVATE KEY-----\nMIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQCv0A0fgqmqIv6u\nWL/L4m3BssVQBFEl+ks79Vc6+WotLQyFFY7fTow0aKMhf4tmaJAZbv86mgtPyApo\ny166cIJgAP5ckyx+cDPKxBDsoBlgNKT94Ovf+3QQR3J5SF+ttbWiVM3GTboIkIFr\nL4QCypqz2z8JJUTlM92sU/O44qQl8BcITwGWz7xvzv0/HYNu4i9oPsdm2Z12ATbD\nllIG38i/xgvAMcWSuFky/hQQbSlgSAHK67I9AHa9QckPde7DBqyKYHB96Ro5MN5o\n0AVEbzBH5/G/Bk4teCaIFwhzXJSU/SKk+D/IExrEeUngLidS2SC8ET5ehQiMOJvw\nR/cputZ6XSWIMsxuggmdS+sY4dHe5SPyIhDD9URBT7ceaScbRbS0NVvFb/+2eH5G\nvviNxwM47vzMvg8Cfkf5RP/o7YeleWYHOtOAgxaKYd+YOXtELMyhVq+F5b8eVeqf\nZpGgNSq3znzob5+mEFWk6mBRYOwW3E1kRT6DacFK4F+AK8UlCoHfeoy6qHH2BON8\nBHHbN9UUg8LazCaADZ/nch1+GG1v3ygSOm7AmR3p+OSQFFolMgUmYG0zvZr3AVqT\nZw9ZJoaRNLNbn059kWNsTDdo+aBHon+UU+z5dwu+FD5zdAl0W5PLjq8O5GeDRw4f\nTu9FA3YAsNpv8VQOFNXrXWefxU6mpwIDAQABAoICAExO0/NSRgu3Zq0LjiuTGqpQ\nyn1Bcms2aMMcaIELUj9LZzy4L6vSrt3scKmQb1PCnJC9cX/g7nnxTDtR0crAHIZI\nyB4sLsquLnyafvIFRx5PmzEqF5a+0BBkwlXLyONfk/diMXIZuF4RQmrgU77WazEX\nPxPcHjwRN+yc/5LGpBJnU8fiasEnZxVsVNS5HZvaBlOLtAZ6+3IFctyPeQjMxpge\nAGmp8KQO6YBNcS30A1prxoNpq5H4ipD4ZakVOc1iLy9cTlcH/r7F7DK33yFl1SHQ\nlUehF/t6Q9cbkCpqC39jI09RBHX1fM+8CQmJXr4Bych2/4gM27notB4lTizJkF8R\nnY+O9VqjqdXevV0PFxc3gdUsYMvMDN5wv1o+JxtWkDrVjA0f3GlpxJk0Gvqsj8La\niagaisYXHk+EpFwFMyBMdm3RQ+JjjVTPNDCdBhW+5dTtuU9KD+lF9Gv5s75iQyUD\nhABMlvyG2RM/3KLqNdixBh3SV5qrD/CF09UxRMwvAloFwzAWBPPzqcHL6ZPKj4ET\nuvxKEcg27dycCaLQ5tzIDQo59sbT5akAoAMI5tpOx5r5tYSdE9DxFGy8nQCBxbXa\nn8AyHMN1Zu1LvxnD+WC4YRYMuKEQdNR123lf/96tO/74a0p/c4zx2seD36VVFmYQ\nLNUP5zlkoAwEQxIqXqe5AoIBAQDbQmO9iw2DA1CL3ZWaftJUgqKPxmmVrkL7DHsN\nwGUVcs7+8YZ1Xkc/JFj5wsFV56EN9naNOJuzfOEya3KSeGsR2pjBNPSlDgacEbJX\nta9LXbnsD+rmrI5tNmD7YUTzTDrIbS87TZnIgetP/U04NpFhiMCk7Gh3aNDAYnI3\nJ8xdTkcZV/BKv8+MrIpnlloGl+v4A1pQXFWy2f2p3mvY0WalnzTCM/EUHzbWGYBR\n/uGxhelpZs4ZzpLrZsYxAi96/yavS+zY5sHNy4zT7bkBaRdf4TLvfe1PRXxMQsPS\nfqpPUxyuIB2PmMoZulkFQRnupqbV2V0O03cF8bI0SSc7Ck8DAoIBAQDNRexEd9cn\nnAsHP5AJSYrhkKn9o/+qYKENDouVfe+QuvwC2NkJ7zn6vUl/zUbRCsA492jBcFQu\ndnjSNI3inQ+WRjGBB2NvqXSRMPqLKQOBsBmqoMjIvR+w/3cJFZcY2iXhpeMeyAaO\n5Ku51UxLQvRbyt5RqI624yZrcJgVe2m5VmWzX2o++qmAYU1FGMczYx92hFPvFffp\nxUdDqKP6UFLH9V1P5sf4um/eYFzaO+pYD8S+EdU5KiRXR13bIOhFNUBF3mvHgOjq\nJ26NUR3bVXd4EgPsAEL2qdF5pjZvZJaBQyf+OnrnqD7bV2FSaKJAF7Cy2RFCGIpa\nDdd5R5ihJ7aNAoIBAQCeJUaXokI+qxdfqpWLd8nxVsA1/6CMa8K4HQpsosbGL6cJ\nz99xrGyrKGZcz5JvicBqt8hOl/QGBB7SJRngd6aSnB7tzGpg2rr9uu3twYgMTjAa\nCmkdtHyOXViaOFBpRCRqCAa3OYOgUcUOTt9xmjpGJUL+Md4vspRPDzLegYAwFJPH\nvdv9rlffWVwC1zlb5Bw5KQHtUIwnkoAaE+mp22+0Kh79rEVIhDMjPgWGHtdfGf1/\nHr2tc4gY7mopUzA4AO1AJv1QfTBwZU7QVXjJgalwaJg6kZOnR7EduFJR8zaYPJRF\nK7jmqAetgvFOjuRLdDyFpmAun2wMB4bHm7QGK6tNAoIBAQCq0B+uTeb87+2BZ5Qt\nFkR6NQ4voTOTjHsXyV2/1R7v2ZjxqY7ZpHcjvjWWIrRmKUMRZFeIeDekvjMGAHN8\n+mNJEjoJe6Nz/JeiZhZmjId9eJOzF75cxHvFpp9gMNYd+RGCtq7LI3nJmGGJ7wNg\nsWNzqtnbK58uctC6oOP9JEgy0MEqRSC9LYq06MMK13aTvU0mKzFJB4fXwLDvjTp+\nhi6MdBHk9k67HDEQ5DD/7NGx29VEsMQ0oGvDMQDZ4oVFae2E9nPLfOrURmHJOJHW\nvUT/5kXbMdCHP4Kvbu9nPFW9VKvH8tPpR2iezxSOJcG2AcCo4tZooNEn5NLD+h75\nI3nVAoIBAHdexvaYQGLWD2r6LjYRp7GueRHXVfpeP3Lc1PXSwiRnGB8Qn4pqONg5\nj0MXrVYhAq/X3Z1/cd17JwZpxqp/1hcbbwlsoASeFaU9i43tU3EDF0Qt1hIpXqxG\nWfmb58ft2hcT12WspyxfaMspECtsJt6dg1VHaulQ+fEln4rT2yxHqsnrU8li9NPp\n5E5OE4xqnuisvqaNk146hMQuXHpULVg8B3cVnMFSSgxqMUkNiHzNlm+TFpTihdlo\nnlcRKVtRuPtUOsP4gcJ9MoOEkxMqQQLFUPJDGDfgxNCsnnt9twIWa9aJDi36NObc\n+Cp2E4G9rjnFoab/Fs9mEVUGUl6N0mA=\n-----END PRIVATE KEY-----\n" } + } } diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_CreateOrUpdate.json b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_CreateOrUpdate.json index 58b9d41de6c..b00214dee4f 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_CreateOrUpdate.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_CreateOrUpdate.json @@ -16,13 +16,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" } } @@ -45,13 +40,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -63,4 +53,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_CreateOrUpdate_BaseManifest.json b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_CreateOrUpdate_BaseManifest.json index ec310a19f85..698f3d9f615 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_CreateOrUpdate_BaseManifest.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_CreateOrUpdate_BaseManifest.json @@ -16,13 +16,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "runtimes": { @@ -50,13 +45,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "runtimes": { @@ -73,4 +63,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Delete.json b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Delete.json index 99ae7550886..346c7ab772f 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Delete.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Get.json b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Get.json index 57dd6c65329..1a0dd1ff1e3 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Get.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Get.json @@ -23,13 +23,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -41,4 +36,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_List.json b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_List.json index 49439c8f9aa..bf8906fadc8 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_List.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_List.json @@ -24,13 +24,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -55,13 +50,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -100,4 +90,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_ListByScope.json b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_ListByScope.json index 94e0ec01e43..80793eb554d 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_ListByScope.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_ListByScope.json @@ -24,13 +24,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -82,13 +77,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -103,4 +93,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Update.json b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Update.json index 614e0bc67bc..7f0041effbd 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Update.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Containers_Update.json @@ -10,13 +10,8 @@ "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" } } @@ -39,13 +34,8 @@ }, "container": { "image": "ghcr.io/radius-project/webapptutorial-todoapp", - "command": [ - "/bin/sh" - ], - "args": [ - "-c", - "while true; do echo hello; sleep 10;done" - ], + "command": ["/bin/sh"], + "args": ["-c", "while true; do echo hello; sleep 10;done"], "workingDir": "/app" }, "identity": { @@ -81,4 +71,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Environments_CreateOrUpdate.json b/typespec/Applications.Core/examples/2023-10-01-preview/Environments_CreateOrUpdate.json index 84a94402791..3ac4c935a2a 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Environments_CreateOrUpdate.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Environments_CreateOrUpdate.json @@ -127,4 +127,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Environments_GetEnv0.json b/typespec/Applications.Core/examples/2023-10-01-preview/Environments_GetEnv0.json index dd4c320eef2..f642d68789c 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Environments_GetEnv0.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Environments_GetEnv0.json @@ -92,4 +92,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Environments_GetRecipeMetadata.json b/typespec/Applications.Core/examples/2023-10-01-preview/Environments_GetRecipeMetadata.json index 6baed5642ab..b36a02ff896 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Environments_GetRecipeMetadata.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Environments_GetRecipeMetadata.json @@ -15,12 +15,12 @@ "templatePath": "br:ghcr.io/sampleregistry/radius/recipes/cosmosdb", "parameters": { "throughput": { - "type" : "int", - "defaultValue" : 400 + "type": "int", + "defaultValue": 400 }, "location": { - "type" : "string", - "defaultValue" : "[resourceGroup().location]" + "type": "string", + "defaultValue": "[resourceGroup().location]" } } } diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Environments_List.json b/typespec/Applications.Core/examples/2023-10-01-preview/Environments_List.json index f1bb8b2096f..4654b8cba4b 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Environments_List.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Environments_List.json @@ -161,4 +161,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Environments_PatchEnv0.json b/typespec/Applications.Core/examples/2023-10-01-preview/Environments_PatchEnv0.json index 8f2e4b52bbe..bf296e2d0d1 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Environments_PatchEnv0.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Environments_PatchEnv0.json @@ -110,4 +110,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_CreateOrUpdate.json b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_CreateOrUpdate.json index 76b4f159d16..fcbe3b9be02 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_CreateOrUpdate.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_CreateOrUpdate.json @@ -1,62 +1,61 @@ { "operationId": "Extenders_CreateOrUpdate", "title": "Create or Update an extender resource", - "parameters": { - "rootScope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup", - "extenderName": "extender0", - "api-version": "2023-10-01-preview", - "ExtenderParameters": { + "parameters": { + "rootScope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup", + "extenderName": "extender0", + "api-version": "2023-10-01-preview", + "ExtenderParameters": { + "location": "West US", + "properties": { + "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", + "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "secrets": { + "accountSid": "sid", + "authToken:": "token" + }, + "resourceProvisioning": "manual" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender0", + "name": "extender0", + "type": "Applications.Core/extenders", "location": "West US", "properties": { + "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "fromNumber": "222-222-2222", "secrets": { - "accountSid": "sid", - "authToken:": "token" + "accountSid": "sid", + "authToken:": "token" }, "resourceProvisioning": "manual" } } }, - "responses": { - "200": { - "body": { - "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender0", - "name": "extender0", - "type": "Applications.Core/extenders", - "location": "West US", - "properties": { - "provisioningState": "Succeeded", - "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", - "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "fromNumber": "222-222-2222", - "secrets": { - "accountSid": "sid", - "authToken:": "token" - }, - "resourceProvisioning": "manual" - } - } - }, - "201": { - "body": { - "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender1", - "name": "extender1", - "type": "Applications.Core/extenders", - "location": "West US", - "properties": { - "provisioningState": "Accepted", - "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", - "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "fromNumber": "222-222-2222", - "secrets": { - "accountSid": "sid", - "authToken:": "token" - }, - "resourceProvisioning": "manual" - } + "201": { + "body": { + "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender1", + "name": "extender1", + "type": "Applications.Core/extenders", + "location": "West US", + "properties": { + "provisioningState": "Accepted", + "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", + "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "fromNumber": "222-222-2222", + "secrets": { + "accountSid": "sid", + "authToken:": "token" + }, + "resourceProvisioning": "manual" } } } + } } - \ No newline at end of file diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_CreateOrUpdateWithRecipe.json b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_CreateOrUpdateWithRecipe.json index 15503ec0808..e6114950136 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_CreateOrUpdateWithRecipe.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_CreateOrUpdateWithRecipe.json @@ -1,13 +1,30 @@ { "operationId": "Extenders_CreateOrUpdate", "title": "Create or Update an extender resource with recipe", - "parameters": { - "rootScope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup", - "extenderName": "extender0", - "api-version": "2023-10-01-preview", - "ExtenderParameters": { + "parameters": { + "rootScope": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testGroup", + "extenderName": "extender0", + "api-version": "2023-10-01-preview", + "ExtenderParameters": { + "location": "West US", + "properties": { + "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", + "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "recipe": { + "name": "s3" + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender0", + "name": "extender0", + "type": "Applications.Core/extenders", "location": "West US", "properties": { + "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", "recipe": { @@ -16,39 +33,21 @@ } } }, - "responses": { - "200": { - "body": { - "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender0", - "name": "extender0", - "type": "Applications.Core/extenders", - "location": "West US", - "properties": { - "provisioningState": "Succeeded", - "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", - "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "recipe": { - "name": "s3" - } - } - } - }, - "201": { - "body": { - "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender1", - "name": "extender1", - "type": "Applications.Core/extenders", - "location": "West US", - "properties": { - "provisioningState": "Succeeded", - "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", - "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", - "recipe": { - "name": "s3" - } + "201": { + "body": { + "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/extenders/extender1", + "name": "extender1", + "type": "Applications.Core/extenders", + "location": "West US", + "properties": { + "provisioningState": "Succeeded", + "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/testApplication", + "environment": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/environments/env0", + "recipe": { + "name": "s3" } } } } + } } - \ No newline at end of file diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Delete.json b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Delete.json index 08aacc41cee..264542a8804 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Delete.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Get.json b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Get.json index 5a8ddbe87a9..af07af0473c 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Get.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Get.json @@ -28,4 +28,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_List.json b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_List.json index 9246caa3335..079d29b7370 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_List.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_List.json @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_ListByRootScope.json b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_ListByRootScope.json index b5e64de39af..f1e3ca328e5 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_ListByRootScope.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_ListByRootScope.json @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_ListSecrets.json b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_ListSecrets.json index 502d4831043..36cecd3ce56 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_ListSecrets.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_ListSecrets.json @@ -16,4 +16,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Update.json b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Update.json index 854d2f8b51d..f2e1d679b51 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Update.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Extenders_Update.json @@ -58,4 +58,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_CreateOrUpdate.json b/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_CreateOrUpdate.json index 71fa5cf16b9..e2958e81475 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_CreateOrUpdate.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_CreateOrUpdate.json @@ -9,12 +9,12 @@ "location": "West US", "properties": { "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", @@ -32,12 +32,12 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_Get.json b/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_Get.json index 7b8a09b3997..ce47781389d 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_Get.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_Get.json @@ -15,12 +15,12 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_List.json b/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_List.json index 4a2c0e8e39a..b795a209697 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_List.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_List.json @@ -16,12 +16,12 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_ListByScope.json b/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_ListByScope.json index 225b186679e..06940110b25 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_ListByScope.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_ListByScope.json @@ -16,13 +16,13 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend", - "path":"/" + "path": "/" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", @@ -37,13 +37,13 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend", - "path":"/backend2" + "path": "/backend2" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_Update.json b/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_Update.json index a0906f47f11..13595746dc3 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_Update.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Gateways_Update.json @@ -9,12 +9,12 @@ "location": "West US", "properties": { "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": true, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", @@ -32,12 +32,12 @@ "properties": { "provisioningState": "Succeeded", "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", - "routes":[ + "routes": [ { "destination": "http://frontend" } - ], - "tls":{ + ], + "tls": { "sslPassthrough": false, "hostname": "myapp.radapp.io", "minimumProtocolVersion": "1.2", diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_CreateOrUpdate_GlobalScope.json b/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_CreateOrUpdate_GlobalScope.json index de3ab2d199b..091432f662d 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_CreateOrUpdate_GlobalScope.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_CreateOrUpdate_GlobalScope.json @@ -1,49 +1,49 @@ { - "operationId": "SecretStores_CreateOrUpdate", - "title": "Create or Update a secret store resource with global scope", - "parameters": { - "rootScope": "/planes/radius/local/resourceGroups/testGroup", - "secretStoreName": "secret", - "api-version": "2023-10-01-preview", - "SecretStoreResource": { + "operationId": "SecretStores_CreateOrUpdate", + "title": "Create or Update a secret store resource with global scope", + "parameters": { + "rootScope": "/planes/radius/local/resourceGroups/testGroup", + "secretStoreName": "secret", + "api-version": "2023-10-01-preview", + "SecretStoreResource": { + "location": "global", + "properties": { + "type": "certificate", + "data": { + "tls.crt": { + "encoding": "base64", + "value": "certificate" + }, + "tls.key": { + "encoding": "base64", + "value": "certificate" + } + }, + "resource": "testNamespace/secret" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/secretStores/secret", + "name": "secret", + "type": "Applications.Core/secretStores", "location": "global", "properties": { + "provisioningState": "Succeeded", "type": "certificate", "data": { "tls.crt": { - "encoding": "base64", - "value": "certificate" + "encoding": "base64" }, "tls.key": { - "encoding": "base64", - "value": "certificate" + "encoding": "base64" } }, "resource": "testNamespace/secret" } } - }, - "responses": { - "200": { - "body": { - "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/secretStores/secret", - "name": "secret", - "type": "Applications.Core/secretStores", - "location": "global", - "properties": { - "provisioningState": "Succeeded", - "type": "certificate", - "data": { - "tls.crt": { - "encoding": "base64" - }, - "tls.key": { - "encoding": "base64" - } - }, - "resource": "testNamespace/secret" - } - } - } } - } \ No newline at end of file + } +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_Get.json b/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_Get.json index 32a9ff7fcf2..0b3f3efb4e9 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_Get.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_Get.json @@ -18,10 +18,8 @@ "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", "type": "certificate", "data": { - "tls.crt": { - }, - "tls.key": { - } + "tls.crt": {}, + "tls.key": {} } } } diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_List.json b/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_List.json index 4d95d3f6653..05625e08b5f 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_List.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/SecretStores_List.json @@ -19,10 +19,8 @@ "application": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/applications/app0", "type": "certificate", "data": { - "tls.crt": { - }, - "tls.key": { - } + "tls.crt": {}, + "tls.key": {} } } }, diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Volumes_Get.json b/typespec/Applications.Core/examples/2023-10-01-preview/Volumes_Get.json index 65624ce9c88..0a57a837ed3 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Volumes_Get.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Volumes_Get.json @@ -52,4 +52,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Core/examples/2023-10-01-preview/Volumes_List.json b/typespec/Applications.Core/examples/2023-10-01-preview/Volumes_List.json index 0bf504f3b85..31c8274beab 100644 --- a/typespec/Applications.Core/examples/2023-10-01-preview/Volumes_List.json +++ b/typespec/Applications.Core/examples/2023-10-01-preview/Volumes_List.json @@ -8,7 +8,8 @@ "responses": { "200": { "body": { - "value": [{ + "value": [ + { "id": "/planes/radius/local/resourceGroups/testGroup/providers/Applications.Core/volumes/keyvault0", "name": "keyvault0", "type": "Applications.Core/volumes", @@ -97,4 +98,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_CreateOrUpdate.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_CreateOrUpdate.json index d3e7bcfd169..b2cba5052df 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_CreateOrUpdate.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_CreateOrUpdate.json @@ -74,4 +74,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_CreateOrUpdateWithRecipe.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_CreateOrUpdateWithRecipe.json index 1e2a605fbfb..b1cca76a9a2 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_CreateOrUpdateWithRecipe.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_CreateOrUpdateWithRecipe.json @@ -63,4 +63,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Delete.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Delete.json index 63a568f43d2..40c2172e4de 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Delete.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Get.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Get.json index 964aca70fed..36521872b7e 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Get.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Get.json @@ -32,4 +32,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_List.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_List.json index c792841bd77..db218545371 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_List.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_List.json @@ -70,4 +70,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_ListByRootScope.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_ListByRootScope.json index 377dfe293c6..742c44fba97 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_ListByRootScope.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_ListByRootScope.json @@ -53,4 +53,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Update.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Update.json index 39ee6e7a623..886bb1a15da 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Update.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/ConfigurationStores_Update.json @@ -74,4 +74,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_CreateOrUpdate.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_CreateOrUpdate.json index 12d7590b534..3c2431411bd 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_CreateOrUpdate.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_CreateOrUpdate.json @@ -74,4 +74,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_CreateOrUpdateWithRecipe.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_CreateOrUpdateWithRecipe.json index dc6c0dd2d2a..c0fd8eea28b 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_CreateOrUpdateWithRecipe.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_CreateOrUpdateWithRecipe.json @@ -63,4 +63,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Delete.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Delete.json index 1a2b2092807..8d4c1657ddc 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Delete.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Get.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Get.json index a42b3a0e4a5..1c5c1491f2e 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Get.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Get.json @@ -32,4 +32,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_List.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_List.json index 8375beaa8bb..4754a95ad5d 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_List.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_List.json @@ -70,4 +70,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_ListByRootScope.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_ListByRootScope.json index f339de48399..7a5b7302ba6 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_ListByRootScope.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_ListByRootScope.json @@ -53,4 +53,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Update.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Update.json index d5c98f29d1d..58b083c8c1c 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Update.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/PubSubBrokers_Update.json @@ -74,4 +74,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_CreateOrUpdate.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_CreateOrUpdate.json index 9fd05878729..7e34284cc75 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_CreateOrUpdate.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_CreateOrUpdate.json @@ -60,4 +60,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Delete.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Delete.json index 0744553b204..440c2a02503 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Delete.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Get.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Get.json index 33e674b2903..d762a9f1515 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Get.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Get.json @@ -27,4 +27,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_List.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_List.json index fc273195f1c..b58043435ca 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_List.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_List.json @@ -48,4 +48,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_ListByRootScope.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_ListByRootScope.json index b01f25fdfb1..15eaca17242 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_ListByRootScope.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_ListByRootScope.json @@ -48,4 +48,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Update.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Update.json index 319e3d8dc54..93e08680478 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Update.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/SecretStores_Update.json @@ -60,4 +60,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_CreateOrUpdate.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_CreateOrUpdate.json index 2baaa6b55b1..1cc5b1a0d40 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_CreateOrUpdate.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_CreateOrUpdate.json @@ -70,4 +70,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_CreateOrUpdateWithRecipe.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_CreateOrUpdateWithRecipe.json index 149fec66728..07b15806d7a 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_CreateOrUpdateWithRecipe.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_CreateOrUpdateWithRecipe.json @@ -52,4 +52,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Delete.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Delete.json index bfe774ce31f..73d263483da 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Delete.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Get.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Get.json index 1605c358111..bfabbb914b4 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Get.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Get.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_List.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_List.json index 8db892bac72..ca069e4921f 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_List.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_List.json @@ -89,4 +89,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_ListByRootScope.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_ListByRootScope.json index 2c98dc98d6d..808dfe201b6 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_ListByRootScope.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_ListByRootScope.json @@ -75,4 +75,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Update.json b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Update.json index 4ffd10fdedc..3013baf8e17 100644 --- a/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Update.json +++ b/typespec/Applications.Dapr/examples/2023-10-01-preview/StateStores_Update.json @@ -70,4 +70,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_CreateOrUpdateRecipe.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_CreateOrUpdateRecipe.json index 392896fcc8c..2fc3d94b805 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_CreateOrUpdateRecipe.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_CreateOrUpdateRecipe.json @@ -59,4 +59,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_CreateOrUpdateValues.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_CreateOrUpdateValues.json index 897dc206766..7d4b10b286e 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_CreateOrUpdateValues.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_CreateOrUpdateValues.json @@ -62,4 +62,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_Delete.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_Delete.json index 752653650f7..0a05ea6d619 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_Delete.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_Get.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_Get.json index a0a7b8f5d0c..bea442b12a4 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_Get.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_Get.json @@ -30,4 +30,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_List.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_List.json index c280d951c50..8867641fa7d 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_List.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_List.json @@ -70,4 +70,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_ListByRootScope.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_ListByRootScope.json index 1aa71c6e079..1014ca1a2aa 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_ListByRootScope.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/MongoDatabases_ListByRootScope.json @@ -71,4 +71,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdate.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdate.json index 57510928650..d478e3a3bd7 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdate.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdate.json @@ -65,4 +65,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdateRecipe.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdateRecipe.json index 64512247560..d7a8f741b60 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdateRecipe.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdateRecipe.json @@ -59,4 +59,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdateValues.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdateValues.json index 88d9dcfb89f..4d4f6a45bd3 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdateValues.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_CreateOrUpdateValues.json @@ -56,4 +56,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Delete.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Delete.json index e468f72cd66..cb9eec9c232 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Delete.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Get.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Get.json index aca26b7c225..1b6ebeb4923 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Get.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Get.json @@ -30,4 +30,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_List.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_List.json index 21e6ae05926..905f450635e 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_List.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_List.json @@ -66,4 +66,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_ListByRootScope.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_ListByRootScope.json index ecf024fb104..f405d6b9a1a 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_ListByRootScope.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_ListByRootScope.json @@ -65,4 +65,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_ListSecrets.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_ListSecrets.json index 185cec6a7cd..8a7e49da322 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_ListSecrets.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_ListSecrets.json @@ -16,4 +16,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Update.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Update.json index f1ac392db3f..aa1148154ee 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Update.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/RedisCaches_Update.json @@ -65,4 +65,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_CreateOrUpdate.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_CreateOrUpdate.json index 7f4a9de8f22..147e1958c79 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_CreateOrUpdate.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_CreateOrUpdate.json @@ -49,4 +49,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Delete.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Delete.json index a092eecce33..21e3e41d8ed 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Delete.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Get.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Get.json index 2de248c7b27..4390634640c 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Get.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Get.json @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_List.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_List.json index 04ca8b7bbf8..3afc35e8d25 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_List.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_List.json @@ -64,4 +64,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_ListByRootScope.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_ListByRootScope.json index 9c6de5f03ac..aab8f047895 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_ListByRootScope.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_ListByRootScope.json @@ -69,4 +69,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_ListSecrets.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_ListSecrets.json index 97118868ef6..c092d2ba398 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_ListSecrets.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_ListSecrets.json @@ -16,4 +16,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Update.json b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Update.json index 13d60114477..c4a59f0de50 100644 --- a/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Update.json +++ b/typespec/Applications.Datastores/examples/2023-10-01-preview/SQLDatabases_Update.json @@ -49,4 +49,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_CreateOrUpdate.json b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_CreateOrUpdate.json index 0b51ad6fdbc..d27d1aa9dea 100644 --- a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_CreateOrUpdate.json +++ b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_CreateOrUpdate.json @@ -56,4 +56,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Delete.json b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Delete.json index d78bb91dd57..2eacd771a00 100644 --- a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Delete.json +++ b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Delete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Get.json b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Get.json index ddd1cb632dd..530a7c38ce8 100644 --- a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Get.json +++ b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Get.json @@ -26,4 +26,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_List.json b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_List.json index 83383819e0e..d5ecd4fa433 100644 --- a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_List.json +++ b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_List.json @@ -44,4 +44,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_ListByRootScope.json b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_ListByRootScope.json index d932a9a7a37..5e4658bc45d 100644 --- a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_ListByRootScope.json +++ b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_ListByRootScope.json @@ -47,4 +47,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_ListSecrets.json b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_ListSecrets.json index 686ec415e05..3be84807872 100644 --- a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_ListSecrets.json +++ b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_ListSecrets.json @@ -14,4 +14,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Update.json b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Update.json index 61dff0e3234..04e9acfeca6 100644 --- a/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Update.json +++ b/typespec/Applications.Messaging/examples/2023-10-01-preview/RabbitMQQueues_Update.json @@ -56,4 +56,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_CreateOrUpdate.json b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_CreateOrUpdate.json index 9b13d6016a0..e4164707ac1 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_CreateOrUpdate.json +++ b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_CreateOrUpdate.json @@ -1,53 +1,53 @@ { - "operationId": "AwsCredentials_CreateOrUpdate", - "title": "Create or update an AWS AccessKey credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "aws", - "credentialName": "default", - "Credential": { - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "accessKeyId": "enterAccessKeyIdHere", - "secretAccessKey": "enterSecretAccessKey", - "storage": { - "kind": "Internal" - } - } + "operationId": "AwsCredentials_CreateOrUpdate", + "title": "Create or update an AWS AccessKey credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "aws", + "credentialName": "default", + "Credential": { + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "accessKeyId": "enterAccessKeyIdHere", + "secretAccessKey": "enterSecretAccessKey", + "storage": { + "kind": "Internal" } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } + } + } }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - }, - "201": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "201": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Delete.json b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Delete.json index c0e5bdb0673..c84b7185b14 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Delete.json +++ b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Delete.json @@ -1,14 +1,14 @@ { - "operationId": "AwsCredentials_Delete", - "title": "Delete an AWS AccessKey credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud", - "credentialName": "default" - }, - "responses": { - "200": {}, - "204": {} - } -} \ No newline at end of file + "operationId": "AwsCredentials_Delete", + "title": "Delete an AWS AccessKey credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud", + "credentialName": "default" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Get.json b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Get.json index 91d728e6f1f..a73e93746d1 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Get.json +++ b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Get.json @@ -1,27 +1,27 @@ { - "operationId": "AwsCredentials_Get", - "title": "Get an AWS AccessKey credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud", - "credentialName": "default" - }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "operationId": "AwsCredentials_Get", + "title": "Get an AWS AccessKey credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud", + "credentialName": "default" + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_List.json b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_List.json index e89535b7fa5..ff9d1c8ce43 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_List.json @@ -1,30 +1,30 @@ { - "operationId": "AwsCredentials_List", - "title": "List AWS AccessKey credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - ] + "operationId": "AwsCredentials_List", + "title": "List AWS AccessKey credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } - } + } + ] + } } -} \ No newline at end of file + } +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Update.json b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Update.json index 37a1cb337e1..d6a599c0f22 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Update.json +++ b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_AccessKey_Update.json @@ -1,53 +1,53 @@ { - "operationId": "AwsCredentials_Update", - "title": "Update an AWS AccessKey credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "aws", - "credentialName": "default", - "Credential": { - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "accessKeyId": "enterAccessKeyIdHere", - "secretAccessKey": "enterSecretAccessKey", - "storage": { - "kind": "Internal" - } - } + "operationId": "AwsCredentials_Update", + "title": "Update an AWS AccessKey credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "aws", + "credentialName": "default", + "Credential": { + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "accessKeyId": "enterAccessKeyIdHere", + "secretAccessKey": "enterSecretAccessKey", + "storage": { + "kind": "Internal" } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } + } + } }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - }, - "201": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "AccessKey", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "201": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "AccessKey", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_CreateOrUpdate.json b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_CreateOrUpdate.json index f59f7e6f14a..91c81314e58 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_CreateOrUpdate.json +++ b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_CreateOrUpdate.json @@ -1,54 +1,54 @@ { - "operationId": "AwsCredentials_CreateOrUpdate", - "title": "Create or update an AWS IRSA credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "aws", - "credentialName": "default", - "Credential": { - "location": "us-west-2", - "properties": { - "kind": "IRSA", - "roleARN": "enterRoleARN", - "storage": { - "kind": "Internal" - } - } + "operationId": "AwsCredentials_CreateOrUpdate", + "title": "Create or update an AWS IRSA credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "aws", + "credentialName": "default", + "Credential": { + "location": "us-west-2", + "properties": { + "kind": "IRSA", + "roleARN": "enterRoleARN", + "storage": { + "kind": "Internal" } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "IRSA", + "roleARN": "enterRoleARN", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } + } + } }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "IRSA", - "roleARN": "enterRoleARN", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - }, - "201": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "IRSA", - "roleARN": "enterRoleARN", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "201": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "IRSA", + "roleARN": "enterRoleARN", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Delete.json b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Delete.json index ceda0d303b1..9ec32c5255c 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Delete.json +++ b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Delete.json @@ -1,14 +1,14 @@ { - "operationId": "AwsCredentials_Delete", - "title": "Delete an AWS IRSA credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud", - "credentialName": "default" - }, - "responses": { - "200": {}, - "204": {} - } -} \ No newline at end of file + "operationId": "AwsCredentials_Delete", + "title": "Delete an AWS IRSA credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud", + "credentialName": "default" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Get.json b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Get.json index adf56c6949b..9bfc60457b0 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Get.json +++ b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Get.json @@ -1,28 +1,28 @@ { - "operationId": "AwsCredentials_Get", - "title": "Get an AWS IRSA credential", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud", - "credentialName": "default" - }, - "responses": { - "200": { - "body": { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "IRSA", - "roleArn": "enterRoleARN", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } + "operationId": "AwsCredentials_Get", + "title": "Get an AWS IRSA credential", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud", + "credentialName": "default" + }, + "responses": { + "200": { + "body": { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "IRSA", + "roleArn": "enterRoleARN", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } + } } -} \ No newline at end of file + } +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_List.json b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_List.json index da727860c8e..da09a3cc2cc 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_List.json @@ -1,31 +1,31 @@ { - "operationId": "AwsCredentials_List", - "title": "List AWS IRSA credentials", - "parameters": { - "api-version": "2023-10-01-preview", - "planeType": "aws", - "planeName": "awscloud" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", - "name": "default", - "type": "System.AWS/credentials", - "location": "us-west-2", - "properties": { - "kind": "IRSA", - "roleArn": "enterRoleARN", - "storage": { - "kind": "Internal", - "secretName": "aws-awscloud-default" - } - } - } - ] + "operationId": "AwsCredentials_List", + "title": "List AWS IRSA credentials", + "parameters": { + "api-version": "2023-10-01-preview", + "planeType": "aws", + "planeName": "awscloud" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/planes/AWS/aws/providers/System.AWS/credentials/default", + "name": "default", + "type": "System.AWS/credentials", + "location": "us-west-2", + "properties": { + "kind": "IRSA", + "roleArn": "enterRoleARN", + "storage": { + "kind": "Internal", + "secretName": "aws-awscloud-default" + } } - } + } + ] + } } -} \ No newline at end of file + } +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Update.json b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Update.json index b6497af3e40..94ef1474c1f 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Update.json +++ b/typespec/UCP/examples/2023-10-01-preview/AWSCredential_IRSA_Update.json @@ -51,4 +51,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ApiVersions_CreateOrUpdate.json b/typespec/UCP/examples/2023-10-01-preview/ApiVersions_CreateOrUpdate.json index 9588c4dd763..a998925356e 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ApiVersions_CreateOrUpdate.json +++ b/typespec/UCP/examples/2023-10-01-preview/ApiVersions_CreateOrUpdate.json @@ -35,4 +35,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ApiVersions_Delete.json b/typespec/UCP/examples/2023-10-01-preview/ApiVersions_Delete.json index 4bedace3503..a9c7a162553 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ApiVersions_Delete.json +++ b/typespec/UCP/examples/2023-10-01-preview/ApiVersions_Delete.json @@ -18,4 +18,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ApiVersions_Get.json b/typespec/UCP/examples/2023-10-01-preview/ApiVersions_Get.json index c12de83dd0e..45d78399746 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ApiVersions_Get.json +++ b/typespec/UCP/examples/2023-10-01-preview/ApiVersions_Get.json @@ -20,4 +20,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ApiVersions_List.json b/typespec/UCP/examples/2023-10-01-preview/ApiVersions_List.json index 358a3274f6e..a5bb23bbbb6 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ApiVersions_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/ApiVersions_List.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_CreateOrUpdate.json b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_CreateOrUpdate.json index bd265833c8f..0e4052e4652 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_CreateOrUpdate.json +++ b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_CreateOrUpdate.json @@ -31,7 +31,7 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -47,11 +47,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Delete.json b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Delete.json index 1be9794e92e..580449ea99a 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Delete.json +++ b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Delete.json @@ -11,4 +11,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Get.json b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Get.json index 630257a9270..4d123f5b45b 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Get.json +++ b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Get.json @@ -19,11 +19,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_List.json b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_List.json index 037785e4b49..11c854b89bf 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_List.json @@ -20,8 +20,8 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Update.json b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Update.json index 4a45fccfc15..eaff3a06049 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Update.json +++ b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_ServicePrincipal_Update.json @@ -31,7 +31,7 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -47,11 +47,11 @@ "tenantId": "00000000-0000-0000-0000-000000000000", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_CreateOrUpdate.json b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_CreateOrUpdate.json index 64a1cfe8e8f..d039ddcb80c 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_CreateOrUpdate.json +++ b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_CreateOrUpdate.json @@ -29,7 +29,7 @@ "kind": "WorkloadIdentity", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -44,11 +44,11 @@ "kind": "WorkloadIdentity", "clientId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Delete.json b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Delete.json index cd93a9d61a0..f51d775a40d 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Delete.json +++ b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Delete.json @@ -11,4 +11,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Get.json b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Get.json index 30d10597555..2c6981a6019 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Get.json +++ b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Get.json @@ -19,11 +19,11 @@ "clientId": "00000000-0000-0000-0000-000000000000", "tenantId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_List.json b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_List.json index 014d17965d0..ffc4ef409dd 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_List.json @@ -20,8 +20,8 @@ "clientId": "00000000-0000-0000-0000-000000000000", "tenantId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Update.json b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Update.json index 3dc540a8f2e..2de65e1450e 100644 --- a/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Update.json +++ b/typespec/UCP/examples/2023-10-01-preview/AzureCredential_WorkloadIdentity_Update.json @@ -30,7 +30,7 @@ "clientId": "00000000-0000-0000-0000-000000000000", "tenantId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal" + "kind": "Internal" } } } @@ -46,11 +46,11 @@ "clientId": "00000000-0000-0000-0000-000000000000", "tenantId": "00000000-0000-0000-0000-000000000000", "storage": { - "kind": "Internal", - "secretName": "azure-azurecloud-default" + "kind": "Internal", + "secretName": "azure-azurecloud-default" } } } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Locations_CreateOrUpdate.json b/typespec/UCP/examples/2023-10-01-preview/Locations_CreateOrUpdate.json index a96ce299861..d707cb02250 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Locations_CreateOrUpdate.json +++ b/typespec/UCP/examples/2023-10-01-preview/Locations_CreateOrUpdate.json @@ -40,4 +40,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Locations_Delete.json b/typespec/UCP/examples/2023-10-01-preview/Locations_Delete.json index 0ed0275bfbe..d259e84eaf8 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Locations_Delete.json +++ b/typespec/UCP/examples/2023-10-01-preview/Locations_Delete.json @@ -17,4 +17,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Locations_Get.json b/typespec/UCP/examples/2023-10-01-preview/Locations_Get.json index 63694b8ba90..b38fec3e94d 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Locations_Get.json +++ b/typespec/UCP/examples/2023-10-01-preview/Locations_Get.json @@ -20,4 +20,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Locations_List.json b/typespec/UCP/examples/2023-10-01-preview/Locations_List.json index a5c18106fa1..f9305b5e3ae 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Locations_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/Locations_List.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Planes_CreateOrUpdate.json b/typespec/UCP/examples/2023-10-01-preview/Planes_CreateOrUpdate.json index 7e5a908e363..5ca838c07c4 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Planes_CreateOrUpdate.json +++ b/typespec/UCP/examples/2023-10-01-preview/Planes_CreateOrUpdate.json @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Planes_Delete.json b/typespec/UCP/examples/2023-10-01-preview/Planes_Delete.json index 509fe433d87..b2944201b30 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Planes_Delete.json +++ b/typespec/UCP/examples/2023-10-01-preview/Planes_Delete.json @@ -10,4 +10,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Planes_GetPlaneLocal.json b/typespec/UCP/examples/2023-10-01-preview/Planes_GetPlaneLocal.json index 5ecac6dfe9d..1ad27fc78fb 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Planes_GetPlaneLocal.json +++ b/typespec/UCP/examples/2023-10-01-preview/Planes_GetPlaneLocal.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Planes_List.json b/typespec/UCP/examples/2023-10-01-preview/Planes_List.json index 919ae68102e..9e9a81cdae1 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Planes_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/Planes_List.json @@ -26,4 +26,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Planes_ListPlanesByType.json b/typespec/UCP/examples/2023-10-01-preview/Planes_ListPlanesByType.json index c10863f6d38..968fa3e70fd 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Planes_ListPlanesByType.json +++ b/typespec/UCP/examples/2023-10-01-preview/Planes_ListPlanesByType.json @@ -26,4 +26,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Planes_Update.json b/typespec/UCP/examples/2023-10-01-preview/Planes_Update.json index b4788ca4bb8..78adf51b6ed 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Planes_Update.json +++ b/typespec/UCP/examples/2023-10-01-preview/Planes_Update.json @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_CreateOrUpdate.json b/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_CreateOrUpdate.json index 88a80d36331..1dddcb1bfb3 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_CreateOrUpdate.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_CreateOrUpdate.json @@ -30,4 +30,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Delete.json b/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Delete.json index a6e1366c626..4bed23caf49 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Delete.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Delete.json @@ -11,4 +11,4 @@ "200": {}, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Get.json b/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Get.json index 4eab6c512b0..cb3cfef812f 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Get.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Get.json @@ -16,4 +16,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_List.json b/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_List.json index 50b43e8f8ac..c5744e516c2 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_List.json @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Update.json b/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Update.json index dae569f6d77..7d9d9b38e54 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Update.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceGroups_Update.json @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_CreateOrUpdate.json b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_CreateOrUpdate.json index 402f2fe4dc6..6f911664e89 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_CreateOrUpdate.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_CreateOrUpdate.json @@ -26,7 +26,7 @@ "id": "/planes/radius/local/providers/System.Resources/resourceProviders/Applications.Test", "name": "Applications.Test", "type": "System.Resources/resourceProviders", - "location": "global", + "location": "global", "properties": { "provisioningState": "Succeeded" } @@ -37,4 +37,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_Delete.json b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_Delete.json index 0d60fc0c090..2b5539c14a4 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_Delete.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_Delete.json @@ -16,4 +16,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_Get.json b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_Get.json index f6ea02f51f1..2da510131cb 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_Get.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_Get.json @@ -19,4 +19,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_GetProviderSummary.json b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_GetProviderSummary.json index 5d96e685820..c92648028d1 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_GetProviderSummary.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_GetProviderSummary.json @@ -24,4 +24,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_List.json b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_List.json index 4c9fbf0003d..31c40be8156 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_List.json @@ -21,4 +21,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_ListProviderSummaries.json b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_ListProviderSummaries.json index 71f71e262dc..5efc181bc32 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_ListProviderSummaries.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceProviders_ListProviderSummaries.json @@ -27,4 +27,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_CreateOrUpdate.json b/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_CreateOrUpdate.json index 92aa7108c21..a5068c19d31 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_CreateOrUpdate.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_CreateOrUpdate.json @@ -40,4 +40,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_Delete.json b/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_Delete.json index 00212013d49..af3f9ac10c3 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_Delete.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_Delete.json @@ -17,4 +17,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_Get.json b/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_Get.json index b3c29e5b519..2a5cc266ade 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_Get.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_Get.json @@ -20,4 +20,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_List.json b/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_List.json index f77af4c566c..a7b11b87c02 100644 --- a/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/ResourceTypes_List.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/typespec/UCP/examples/2023-10-01-preview/Resources_List.json b/typespec/UCP/examples/2023-10-01-preview/Resources_List.json index 3856e126bac..90c3967ba70 100644 --- a/typespec/UCP/examples/2023-10-01-preview/Resources_List.json +++ b/typespec/UCP/examples/2023-10-01-preview/Resources_List.json @@ -1,28 +1,28 @@ { - "operationId": "Resources_List", - "title": "List resources in a resource group.", - "parameters": { - "api-version": "2023-10-01-preview", - "planeName": "local", - "planeType": "radius", - "resourceGroupName": "rg1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/planes/radius/local/resourcegroups/rg1/providers/Applications.Core/containers/my-container", - "name": "my-container", - "type": "Applications.Core/containers" - }, - { - "id": "/planes/radius/local/resourcegroups/rg1/providers/Applications.Core/applications/my-application", - "name": "my-application", - "type": "Applications.Core/applications" - } - ] - } + "operationId": "Resources_List", + "title": "List resources in a resource group.", + "parameters": { + "api-version": "2023-10-01-preview", + "planeName": "local", + "planeType": "radius", + "resourceGroupName": "rg1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/planes/radius/local/resourcegroups/rg1/providers/Applications.Core/containers/my-container", + "name": "my-container", + "type": "Applications.Core/containers" + }, + { + "id": "/planes/radius/local/resourcegroups/rg1/providers/Applications.Core/applications/my-application", + "name": "my-application", + "type": "Applications.Core/applications" + } + ] } } - } \ No newline at end of file + } +} diff --git a/typespec/package.json b/typespec/package.json index 44eb82d5655..bcd3008b101 100644 --- a/typespec/package.json +++ b/typespec/package.json @@ -16,4 +16,4 @@ "private": true, "author": "Radius Authors", "license": "Apache-2.0" -} \ No newline at end of file +}