Skip to content

Commit

Permalink
Merge branch 'master' into wilcob/customers
Browse files Browse the repository at this point in the history
  • Loading branch information
wilcobmsft committed Aug 12, 2019
2 parents 9676327 + 1ac947c commit e5b822f
Show file tree
Hide file tree
Showing 3,595 changed files with 265,054 additions and 55,044 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
107 changes: 2 additions & 105 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,106 +1,3 @@
# Contributing to azure-rest-api-specs
First, thank you for contributing to Azure specs repository! Swagger specs are the basis for generating Azure SDKs in multiple different languages, Azure CLIs for interacting with the services, and can provide documentation for these services.

## Basics
If you're a spec author looking for information about all of the repositories and steps in the pipeline, go to the [adx-documentation-pr](https://github.com/Azure/adx-documentation-pr) repository. Make sure to [join the Github Azure organization](http://aka.ms/azuregithub) to get access to that repo.

## Table of Contents
[Before starting](#before-starting)
- [Onboarding](#onboarding)
- [Github basics](#github-basics)
- [Code of Conduct](#code-of-conduct)

[Making changes](#making-changes)
- [Documentation](#documentation)
- [Filenames and folder structure](#filenames-and-folder-structure)
- [Tools for writing Swagger](#tools-for-writing-swagger)
- [Tools for validating Swagger](#tools-for-validating-swagger)

[Submitting a PR](#submitting-a-pr)

[Review process](#review-process)
- [SLA](#sla)
- [Review Criteria](#review-criteria)

## Before starting

### Onboarding
Make sure that your Github account is part of the Azure organization. [Use this page](http://aka.ms/azuregithub) to link your account.

Before cloning this repository, please make sure you have started in our [documentation repository adx-documentation-pr](https://github.com/Azure/adx-documentation-pr) (you will only have access to that page if you are part of the Azure organization).

### Github basics

#### GitHub workflow
If you don't have experience with Git and Github, some of the terminology and process can be confusing. [Here's a guide to understanding Github](https://guides.github.com/introduction/flow/).

#### Forking the Azure/azure-rest-api-specs repository
Unless you are working with multiple contributors on the same file, we ask that you fork the repository and submit your Pull Request from there. [Here's a guide to forks in Github](https://guides.github.com/activities/forking/).

### Code of Conduct
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

## Making changes
Swagger files are simply JSON files that follow the [OpenAPI Specification](http://swagger.io/specification/). This specification is extensible, and there are extensions that are used by AutoRest when your SDK is generated. Additionally, there are patterns and standards that are necessary for generating quality SDKs and CLIs.

### Documentation
The [/documentation](../documentation/) folder contains many resources for writing Swagger files.

The [Swagger Checklist](../documentation/swagger-checklist.md) page is intended as a guide for different scenarios. If you know the service behavior that you're trying to model (e.g. PUT/PATCH/GET responses and request schemas, or modeling long running operations), that document is structured to make it easy to find our recommendations.

The [Reference Documentation](../documentation/creating-swagger.md) page contains lots of information about each part of a Swagger file and how to structure it correctly for code generation. If you're looking for an explanation on what a part of Swagger relates to your service or how it's used to generate code, that document is the right place to go.

### Filenames and folder structure
- Swagger spec for every api-version should be in a separate folder named with the api-version.
- It is time consuming to review the file line by line for every api-version. When you are creating the swagger spec for the new api-version, please copy the swagger spec from the previous version in to the new api-versioned folder and commit it. After that overwrite it with the changes for the new api-version. This makes it easy for us to review the changes.

### Tools for writing Swagger
As JSON files, specs can be modified in any text editor that you choose. We have some recommendations that can make editing these files easier.

- _**Recommended**_ Visual Studio Code.
- Visual Studio Code can provide a nice experience for editing JSON, though it takes extra work to use the JSON schema that defines Swagger files.

### Tools for validating Swagger
There are some tools that can help you make sure your spec conforms to guidelines. The more of these issues that are caught before the PR is sent, the quicker the turnaround to merging the PR will be.

- _**Recommended**_ Please take a look at the [validation tools for swagger checklist](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/swagger-checklist.md#validation-tools-for-swagger-checklist) section.
- The [OpenAPI Initiative Swagger editor](http://editor.swagger.io/#/) will help find basic issues in a Swagger file. However, we apply a higher bar than this validator - just because this site doesn't show errors doesn't mean the spec is ready to merge.
- Similarly, this online [schema validator](https://json-schema-validator.herokuapp.com/) can help find basic errors. Again, we apply a higher bar than this validator - just because this site doesn't show errors doesn't mean the spec is ready to merge.
* In the upper left box, paste the [swagger schema from here](https://github.com/swagger-api/swagger-spec/blob/master/schemas/v2.0/schema.json)
* In the lower left box, paste your swagger json
* Upon clicking the validate button, you should either see errors or success.

## Submitting a PR

Please send a [GitHub Pull Request to Azure REST API Specs](https://github.com/azure/azure-rest-api-specs/pull/new/master) with a clear list of what you've done (read more about [pull requests](http://help.github.com/pull-requests/)). When you send a pull request, we will love you forever if you include additions to the documentation for your given service. We can always use more documentation and beautiful markdown. Please follow make sure all of your commits are atomic (one feature per commit).

Always write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should look like this:

$ git commit -m "A brief summary of the commit
>
> A paragraph describing what changed and its impact."

Please be kind with your pull requests and ensure you keeping them as focused and cohesive as possible. Keep your pull
request free of merge commits, code review fixes and anything that may take away from the essence of your contribution.
Use the git tools you have available to you, such as amend, rebase, etc.


## Review process
We review spec PRs to maintain a high bar of quality for all products that will be generated from these specs (including SDKs in all languages, CLIs and documentation). It's critical that spec files are both syntactically and semantically correct, as well as conform to common patterns that make it possible to generate SDKs and CLIs that are usable for customers. Since specs are the base input for all of these products, the review process starts with PRs to this repository. Please refer to [Swagger Review Process](https://github.com/Azure/adx-documentation-pr/wiki/Swagger-Review-Process) for more details.

The expectation is that every spec in a PR will be correct JSON, syntactically correct, will semantically agree with the service it applies to, and will follow the recommended patterns.

#### Basic JSON correctness
A spec file must be valid JSON, according to the [JSON specification](https://tools.ietf.org/html/rfc7159). It must also be a valid Swagger file, according to the [OpenAPI Specification](http://swagger.io/specification/). Finally, it must also conform to the [schema that AutoRest applies](https://raw.githubusercontent.com/Azure/autorest/master/schema/swagger-extensions.json).

#### Semantic correctness
Your spec file must correctly represent your service. Even if a spec passes all of the rules listed above, it might not accurately describe the service that it is intended to describe. This could include
- Incorrect schemas for responses or requests (both missing and superfluous properties)
- Missing operations
- Missing parameters (especially required ones)
- etc (this list is not comprehensive)

Making sure that the spec is correct from a semantic point of view requires domain knowledge and careful comparison of your spec file with your actual service. We will do our best to point out inconsistencies between spec and service if we can infer them, but you are responsible for making sure your spec and service agree.

**Recommendation**: Check each operation, parameter, schema, property to make sure it accurately models the service API. Refer back to the [Reference documentation](../documentation/creating-swagger.md) for more details on every part of Swagger.
### *This is an outdated document. Please refer the new [wiki](https://github.com/Azure/adx-documentation-pr/wiki) for up to date details.*
([`Link your GitHub account`](https://repos.opensource.microsoft.com/) to the 'Azure' organization for access.)

27 changes: 27 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"default": true,
"MD001": false,
"MD003": false,
"MD004": false,
"MD005": false,
"MD006": false,
"MD007": false,
"MD009": false,
"MD012": false,
"MD013": false,
"MD020": false,
"MD022": false,
"MD024": false,
"MD025": false,
"MD026": false,
"MD028": false,
"MD029": false,
"MD031": false,
"MD032": false,
"MD033": false,
"MD034": false,
"MD036": false,
"MD040": false,
"MD041": false,
"MD047": false
}
6 changes: 3 additions & 3 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,20 @@
/specification/recoveryservicessiterecovery/ @avneeshrai
/specification/redis/ @siddharthchatrolams @timlovellsmith
/specification/relay/ @sethmanheim @v-ajnava
/specification/resources/ @rajshah11 @stankovski @vivsriaus
/specification/resources/ @Tiano2017 @rajshah11 @vivsriaus
/specification/scheduler/ @pinwang81
/specification/search/ @brjohnstmsft
/specification/serialconsole/ @amitchat @craigw @asinn826
/specification/service-map/ @daveirwin1
/specification/servicebus/ @sazeesha @v-ajnava
/specification/servicefabric/ @juhacket @samedder
/specification/sql/ @dnayantara @jaredmoo @nathannfan
/specification/storage/ @jasonyang-msft @stankovski
/specification/storage/ @jasonyang-msft @xiaonlimsft
/specification/storageimportexport/ @leoz-ms
/specification/storagesync/ @ankushbindlish2
/specification/storsimple8000series/ @manaas-microsoft
/specification/streamanalytics/ @atpham256
/specification/subscriptions/ @stankovski
/specification/subscriptions/ @navysingla
/specification/timeseriesinsights/ @sandshadow
/specification/trafficmanager/ @allencal @hrkulkarmsft
/specification/web/ @lukaszstem @naveedaz @nking92
Expand Down
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@

This repository is the canonical source for REST API specifications for Microsoft Azure.

## Basics
If you're a spec author looking for information about all of the repositories and steps in the pipeline, go to the [adx-documentation-pr](https://github.com/Azure/adx-documentation-pr) repository. Make sure to [join the Github Azure organization](http://aka.ms/azuregithub) to get access to that repo.
## Getting started
If you're a spec author looking for information about all of the repositories and steps in the pipeline, go to our [documentation](https://github.com/Azure/adx-documentation-pr/wiki) repository. Make sure to [join the Github Azure organization](http://aka.ms/azuregithub) to get access to that repo.

<b>Latest improvement:</b><i> Microsoft employees can try out our new experience at [OpenAPI Hub](https://aka.ms/openapihub) - online experience for using our validation tools and finding your workflow.</i>

Please check the [announcements page](https://github.com/Azure/azure-rest-api-specs/wiki/Announcements) for any new updates since your last visit.

## Getting started
- Our [Contribution guidelines](./.github/CONTRIBUTING.md) walks you through the process of contributing to this repository.
- The [/documentation](./documentation/) folder contains reference documentation for all aspects of Swagger and our recommended patterns. Start with the [Creating Swagger](./documentation/creating-swagger.md) page.

## Directory Structure

The structure of the directory should strictly follow these rules:
Expand Down
141 changes: 69 additions & 72 deletions arm-compute/quickstart-templates/aliases.json
Original file line number Diff line number Diff line change
@@ -1,90 +1,87 @@
{
"$schema":"http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json",
"contentVersion":"1.0.0.0",
"parameters":{},
"variables":{},
"resources":[],

"outputs":{
"aliases":{
"type":"object",
"value":{

"Linux":{
"CentOS":{
"publisher":"OpenLogic",
"offer":"CentOS",
"sku":"7.5",
"version":"latest"
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json",
"contentVersion": "1.0.0.0",
"parameters": {},
"variables": {},
"resources": [],
"outputs": {
"aliases": {
"type": "object",
"value": {
"Linux": {
"CentOS": {
"publisher": "OpenLogic",
"offer": "CentOS",
"sku": "7.5",
"version": "latest"
},
"CoreOS":{
"publisher":"CoreOS",
"offer":"CoreOS",
"sku":"Stable",
"version":"latest"
"CoreOS": {
"publisher": "CoreOS",
"offer": "CoreOS",
"sku": "Stable",
"version": "latest"
},
"Debian":{
"publisher":"credativ",
"offer":"Debian",
"sku":"9",
"version":"latest"
"Debian": {
"publisher": "Debian",
"offer": "debian-10",
"sku": "10",
"version": "latest"
},
"openSUSE-Leap": {
"publisher":"SUSE",
"offer":"openSUSE-Leap",
"sku":"42.3",
"publisher": "SUSE",
"offer": "openSUSE-Leap",
"sku": "42.3",
"version": "latest"
},
"RHEL":{
"publisher":"RedHat",
"offer":"RHEL",
"sku":"7-RAW",
"version":"latest"
"RHEL": {
"publisher": "RedHat",
"offer": "RHEL",
"sku": "7-RAW",
"version": "latest"
},
"SLES":{
"publisher":"SUSE",
"offer":"SLES",
"sku":"15",
"version":"latest"
"SLES": {
"publisher": "SUSE",
"offer": "SLES",
"sku": "15",
"version": "latest"
},
"UbuntuLTS":{
"publisher":"Canonical",
"offer":"UbuntuServer",
"sku":"18.04-LTS",
"version":"latest"
"UbuntuLTS": {
"publisher": "Canonical",
"offer": "UbuntuServer",
"sku": "18.04-LTS",
"version": "latest"
}
},

"Windows":{
"Win2019Datacenter":{
"publisher":"MicrosoftWindowsServer",
"offer":"WindowsServer",
"sku":"2019-Datacenter",
"version":"latest"
"Windows": {
"Win2019Datacenter": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
"sku": "2019-Datacenter",
"version": "latest"
},
"Win2016Datacenter":{
"publisher":"MicrosoftWindowsServer",
"offer":"WindowsServer",
"sku":"2016-Datacenter",
"version":"latest"
"Win2016Datacenter": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
"sku": "2016-Datacenter",
"version": "latest"
},
"Win2012R2Datacenter":{
"publisher":"MicrosoftWindowsServer",
"offer":"WindowsServer",
"sku":"2012-R2-Datacenter",
"version":"latest"
"Win2012R2Datacenter": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
"sku": "2012-R2-Datacenter",
"version": "latest"
},
"Win2012Datacenter":{
"publisher":"MicrosoftWindowsServer",
"offer":"WindowsServer",
"sku":"2012-Datacenter",
"version":"latest"
"Win2012Datacenter": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
"sku": "2012-Datacenter",
"version": "latest"
},
"Win2008R2SP1":{
"publisher":"MicrosoftWindowsServer",
"offer":"WindowsServer",
"sku":"2008-R2-SP1",
"version":"latest"
"Win2008R2SP1": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
"sku": "2008-R2-SP1",
"version": "latest"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion arm-compute/quickstart-templates/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -417,4 +417,4 @@
"description": "Client Api Version."
}
}
}
}
2 changes: 1 addition & 1 deletion arm-compute/quickstart-templates/vm-simple-linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion arm-compute/quickstart-templates/vm-simple-windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion arm-compute/quickstart-templates/vm-simple.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@
"type": "object"
}
}
}
}
9 changes: 6 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,15 @@ jobs:
timeoutInMinutes: 120
strategy:
matrix:
ruby:
AZURE_SDK_REPO: azure-sdk-for-ruby
AZURE_SDK_PARAMS: ''
java:
AZURE_SDK_REPO: azure-sdk-for-java
AZURE_SDK_PARAMS: ''
javascript:
AZURE_SDK_REPO: azure-sdk-for-js
AZURE_SDK_PARAMS: ''
node:
AZURE_SDK_REPO: azure-sdk-for-node
AZURE_SDK_PARAMS: ''
python:
AZURE_SDK_REPO: azure-sdk-for-python
AZURE_SDK_PARAMS: ''
Expand Down
Loading

0 comments on commit e5b822f

Please sign in to comment.