Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing readmes in resources #7163

Merged
merged 10 commits into from
Sep 11, 2019
Merged

fixing readmes in resources #7163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4eb7109
updating readmes
Sep 10, 2019
5ceac68
removed duplicate
Sep 10, 2019
b8497cc
fixed multiapi for managed applications
Sep 10, 2019
b02003c
fixed managedapplication path
Sep 10, 2019
7bb0714
try to suppress
Sep 10, 2019
82b8546
additional suppression fix
Sep 10, 2019
9ca2b08
removed suppressions
Sep 10, 2019
3bd7dc9
readding suppressions
Sep 10, 2019
3c5552e
final changes
Sep 10, 2019
3e6ec14
leave managed servuices as a single api
Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions specification/resources/resource-manager/readme.go.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ batch:
- tag: package-resources-2016-07
- tag: package-resources-2016-02
- tag: package-resources-2015-11
- tag: package-subscriptions-2019-06
- tag: package-subscriptions-2018-06
- tag: package-subscriptions-2016-06
- tag: package-subscriptions-2015-11
Expand Down Expand Up @@ -251,6 +252,16 @@ namespace: resources
output-folder: $(go-sdk-folder)/services/resources/mgmt/2015-11-01/resources
```

### Tag: package-subscriptions-2019-06 and go

These settings apply only when `--tag=package-subscriptions-2019-06 --go` is specified on the command line.
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

``` yaml $(tag) == 'package-subscriptions-2019-06' && $(go)
namespace: subscriptions
output-folder: $(go-sdk-folder)/services/resources/mgmt/2019-06-01/subscriptions
```

### Tag: package-subscriptions-2018-06 and go

These settings apply only when `--tag=package-subscriptions-2018-06 --go` is specified on the command line.
Expand Down
28 changes: 14 additions & 14 deletions specification/resources/resource-manager/readme.java.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Generate all API versions currently shipped for this package

``` yaml $(java) && $(multiapi)
batch:
- tag: package-2019-06
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if there sdk released for this already? what's the impact of removing this line?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added package-subscriptions-2019-06 below, so result is the same

- tag: package-features-2015-12
- tag: package-locks-2016-09
- tag: package-policy-2019-06
Expand All @@ -33,23 +32,11 @@ batch:
- tag: package-resources-2019-03
- tag: package-resources-2018-02
- tag: package-resources-2016-09
- tag: package-subscriptions-2019-06
- tag: package-subscriptions-2018-06
- tag: package-subscriptions-2016-06
```

### Tag: package-2019-06 and java

These settings apply only when `--tag=package-2019-06 --java` is specified on the command line.
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.

``` yaml $(tag) == 'package-2019-06' && $(java) && $(multiapi)
java:
namespace: com.microsoft.azure.management.resources.v2019_06_01
output-folder: $(azure-libraries-for-java-folder)/resources/resource-manager/v2019_06_01
regenerate-manager: true
generate-interface: true
```

### Tag: package-features-2015-12 and java

These settings apply only when `--tag=package-features-2015-12 --java` is specified on the command line.
Expand Down Expand Up @@ -259,6 +246,19 @@ regenerate-manager: true
generate-interface: true
```

### Tag: package-subscriptions-2019-06 and java

These settings apply only when `--tag=package-subscriptions-2019-06 --java` is specified on the command line.
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.

``` yaml $(tag) == 'package-subscriptions-2019-06' && $(java) && $(multiapi)
java:
namespace: com.microsoft.azure.management.resources.v2019_06_01
output-folder: $(azure-libraries-for-java-folder)/resources/resource-manager/v2019_06_01
regenerate-manager: true
generate-interface: true
```

### Tag: package-subscriptions-2018-06 and java

These settings apply only when `--tag=package-subscriptions-2018-06 --java` is specified on the command line.
Expand Down
17 changes: 2 additions & 15 deletions specification/resources/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,35 +40,22 @@ tag: package-locks-2016-09
tag: package-policy-2019-06
```

``` yaml $(package-policy)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

Copy link
Author

@zikalino zikalino Sep 10, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was duplicated, and second has overwritten first resulting in wrong version included in some sdks

tag: package-policy-2019-01
```

``` yaml $(package-resources)
tag: package-resources-2019-08
```

``` yaml $(package-subscriptions)
tag: package-subscriptions-2018-06
tag: package-subscriptions-2019-06
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the sorting order? it's a mess now.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what do you mean, there's only one tag in here?

```

``` yaml $(package-links)
tag: package-links-2016-09
```

``` yaml $(package-managedapplications)
tag: package-2019-06
tag: package-managedapplications-2018-06
```


### Tag: package-2019-06

These settings apply only when `--tag=package-2019-06` is specified on the command line.

```yaml $(tag) == 'package-2019-06'
input-file:
- Microsoft.Resources/stable/2019-06-01/subscriptions.json
```
### Tag: package-features-2015-12

These settings apply only when `--tag=package-features-2015-12` is specified on the command line.
Expand Down
12 changes: 0 additions & 12 deletions specification/resources/resource-manager/readme.python.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ batch:
- tag: package-locks-2016-09
- tag: package-locks-2015-01
- tag: package-managedapplications-2018-06
- tag: package-managedapplications-2017-09
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this tag is removed?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because managedapplications was intentionally generated as single-api, and the second tag was put by mistake here by service team.
basically, in current configuration package-managedapplications-2017-09 will overwrite package-managedapplications-2018-06 meaning that old package was released instead of new one.
so after discussing with @lmazuel I decided to leave it as single api and fix the problem introduced by the service team.

- tag: package-policy-2019-06
- tag: package-policy-2019-01
- tag: package-policy-2018-05
Expand Down Expand Up @@ -104,17 +103,6 @@ python:
output-folder: $(python-sdks-folder)/resources/azure-mgmt-resource/azure/mgmt/resource/managedapplications
```

### Tag: package-managedapplications-2017-09 and python

These settings apply only when `--tag=package-managedapplications-2017-09 --python` is specified on the command line.
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-managedapplications-2017-09' && $(python)
python:
namespace: azure.mgmt.resource.managedapplications
output-folder: $(python-sdks-folder)/resources/azure-mgmt-resource/azure/mgmt/resource/managedapplications
```

### Tag: package-policy-2019-06 and python

These settings apply only when `--tag=package-policy-2019-06 --python` is specified on the command line.
Expand Down
11 changes: 11 additions & 0 deletions specification/resources/resource-manager/readme.ruby.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,22 @@ package-name: azure_mgmt_subscriptions
package-version: "0.16.0"
azure-arm: true
batch:
- tag: package-subscriptions-2019-06
- tag: package-subscriptions-2018-06
- tag: package-subscriptions-2016-06
- tag: package-subscriptions-2015-11
```

### Tag: package-subscriptions-2019-06 and ruby

These settings apply only when `--tag=package-subscriptions-2019-06 --ruby` is specified on the command line.
Please also specify `--ruby-sdks-folder=<path to the root directory of your azure-sdk-for-ruby clone>`.

``` yaml $(tag) == 'package-subscriptions-2019-06' && $(ruby)
namespace: "Azure::Subscriptions::Mgmt::V2019_06_01"
output-folder: $(ruby-sdks-folder)/management/azure_mgmt_subscriptions/lib
```

### Tag: package-subscriptions-2018-06 and ruby

These settings apply only when `--tag=package-subscriptions-2018-06 --ruby` is specified on the command line.
Expand Down