Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Updated managed instance swagger and examples #5138

Conversation

stefanb995
Copy link
Contributor

*Updated ProxyOverride property in swagger file with enum
*Updated examples with ProxyOverride and PublicDataEndpointEnabled

Latest improvements:

MSFT employees can try out our new experience at OpenAPI Hub - one location for using our validation tools and finding your workflow.

Contribution checklist:

  • I have reviewed the documentation for the workflow.
  • Validation tools were run on swagger spec(s) and have all been fixed in this PR.
  • The OpenAPI Hub was used for checking validation status and next steps.

ARM API Review Checklist

  • Service team MUST add the "WaitForARMFeedback" label if the management plane API changes fall into one of the below categories.
  • adding/removing APIs.
  • adding/removing properties.
  • adding/removing API-version.
  • adding a new service in Azure.

Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs.

  • If you are blocked on ARM review and want to get the PR merged urgently, please get the ARM oncall for reviews (RP Manifest Approvers team under Azure Resource Manager service) from IcM and reach out to them.
    Please follow the link to find more details on API review process.

Adding two new ManagedInstance properties
*Update of ProxyOverride property for Managed Instance
*Update of examples
@AutorestCI
Copy link

AutorestCI commented Feb 1, 2019

Automation for azure-sdk-for-ruby

A PR has been created for you based on this PR content.

Once this PR will be merged, content will be added to your service PR:
Azure/azure-sdk-for-ruby#2143

@AutorestCI
Copy link

AutorestCI commented Feb 1, 2019

Automation for azure-sdk-for-python

The initial PR has been merged into your service PR:
Azure/azure-sdk-for-python#3769

@AutorestCI
Copy link

AutorestCI commented Feb 1, 2019

Automation for azure-sdk-for-js

A PR has been created for you based on this PR content.

Once this PR will be merged, content will be added to your service PR:
Azure/azure-sdk-for-js#1135

@AutorestCI
Copy link

AutorestCI commented Feb 1, 2019

Automation for azure-sdk-for-go

The initial PR has been merged into your service PR:
Azure/azure-sdk-for-go#4057

@azuresdkci
Copy link
Contributor

Can one of the admins verify this patch?

@@ -48,7 +50,8 @@
"subnetId" : "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
"dnsZone": "1b4e2caff2530",
Copy link
Contributor

Choose a reason for hiding this comment

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

Is publicDataEndpointEnabled intentionally not there in the response?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it's by design.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I talked with Mladen who was implementing this feature. He actually forgot to include it here. It should be in response. I'll update it and he'll make sure to update his part.

@@ -47,7 +49,8 @@
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : "false"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is proxyOverride intentionally missing?

Copy link
Contributor Author

@stefanb995 stefanb995 Feb 4, 2019

Choose a reason for hiding this comment

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

Updated. It should be empty string because this instance is created before this property is introduced and the value for this property is null as I have already explained.

"x-ms-enum":{
"name": "ManagedInstanceProxyOverride",
"modelAsString": true
},
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: please fix indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

@AutorestCI
Copy link

AutorestCI commented Feb 1, 2019

Automation for azure-sdk-for-java

Encountered an unknown error: (azure-sdk-for-java)

Traceback (most recent call last):
  File "/usr/local/lib/python3.6/dist-packages/azure_devtools/ci_tools/github_tools.py", line 33, in exception_to_github
    yield context
  File "/usr/local/lib/python3.6/dist-packages/swaggertosdk/restapi/github.py", line 170, in rest_handle_action
    return rest_pull_close(body, restapi_repo, sdk_pr_target_repo, sdkbase, sdk_tag)
  File "/usr/local/lib/python3.6/dist-packages/swaggertosdk/restapi/github.py", line 185, in rest_pull_close
    rest_pr_management(rest_pr, sdk_pr_target_repo, sdk_tag, sdk_default_base)
  File "/usr/local/lib/python3.6/dist-packages/swaggertosdk/restapi/github_handler.py", line 151, in rest_pr_management
    sdk_tag=sdk_tag
  File "/usr/local/lib/python3.6/dist-packages/swaggertosdk/SwaggerToSdkNewCLI.py", line 309, in generate_sdk_from_git_object
    sdk_repo.git.push('origin', base_branch, set_upstream=True)
  File "/usr/local/lib/python3.6/dist-packages/git/cmd.py", line 548, in <lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "/usr/local/lib/python3.6/dist-packages/git/cmd.py", line 1014, in _call_process
    return self.execute(call, **exec_kwargs)
  File "/usr/local/lib/python3.6/dist-packages/git/cmd.py", line 825, in execute
    raise GitCommandError(command, status, stderr_value, stdout_value)
git.exc.GitCommandError: Cmd('git') failed due to: exit code(128)
  cmdline: git push --set-upstream origin restapi_auto_sql/resource-manager
  stderr: 'remote: Permission to Azure/azure-sdk-for-java.git denied to AutorestCI.
fatal: unable to access 'https://AutorestCI:58ab395c311d1bd75b3e1db1cc8adaf9acc42afe@github.com/Azure/azure-sdk-for-java.git/': The requested URL returned error: 403'

@AutorestCI
Copy link

AutorestCI commented Feb 1, 2019

Automation for azure-sdk-for-node

A PR has been created for you based on this PR content.

Once this PR will be merged, content will be added to your service PR:
Azure/azure-sdk-for-node#4181

@veronicagg veronicagg assigned anuchandy and unassigned veronicagg Feb 1, 2019
@veronicagg veronicagg requested review from anuchandy and removed request for veronicagg February 1, 2019 21:44
@veronicagg
Copy link
Contributor

@anuchandy giving you this PR as I took your other one (just a swap) thanks!

Fixed indentation.
@anuchandy
Copy link
Member

@stefanb995 please fix conflicts in managedInstances.json.

@@ -23,7 +23,9 @@
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZonePartner": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance"
"dnsZonePartner": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"publicDataEndpointEnabled" : "false",
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't think the boolean value should be quoted

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. I fixed it.

Copy link
Member

@anuchandy anuchandy left a comment

Choose a reason for hiding this comment

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

@stefanb995 could you fix the conflict in managedInstances.json

Fixed indentation
@stefanb995
Copy link
Contributor Author

Fixed.

@stefanb995
Copy link
Contributor Author

Can you please approve this. I need it merged to regenerate SDK from master branch.

@anuchandy
Copy link
Member

@stefanb995 it seems there are still conflicts in managedInstances.json?

@stefanb995
Copy link
Contributor Author

My bad. It should be fixed now.

@anuchandy anuchandy merged commit be751b2 into Azure:master Feb 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants