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

small edits to lease client docs #7550

Merged
merged 15 commits into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions doc/sphinx/ref/azure.core.pipeline.policies.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ azure.core.pipeline.policies.custom\_hook module
:undoc-members:
:show-inheritance:

azure.core.pipeline.policies.distributed\_tracing module
--------------------------------------------------------

.. automodule:: azure.core.pipeline.policies.distributed_tracing
:members:
:undoc-members:
:show-inheritance:

azure.core.pipeline.policies.redirect module
--------------------------------------------

Expand Down
9 changes: 9 additions & 0 deletions doc/sphinx/ref/azure.core.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Subpackages

azure.core.pipeline
azure.core.polling
azure.core.tracing

Submodules
----------
Expand Down Expand Up @@ -52,6 +53,14 @@ azure.core.exceptions module
:undoc-members:
:show-inheritance:

azure.core.match\_conditions module
-----------------------------------

.. automodule:: azure.core.match_conditions
:members:
:undoc-members:
:show-inheritance:

azure.core.paging module
------------------------

Expand Down
22 changes: 22 additions & 0 deletions doc/sphinx/ref/azure.core.tracing.ext.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
azure.core.tracing.ext package
==============================

Submodules
----------

azure.core.tracing.ext.opencensus\_span module
----------------------------------------------

.. automodule:: azure.core.tracing.ext.opencensus_span
:members:
:undoc-members:
:show-inheritance:


Module contents
---------------

.. automodule:: azure.core.tracing.ext
:members:
:undoc-members:
:show-inheritance:
53 changes: 53 additions & 0 deletions doc/sphinx/ref/azure.core.tracing.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
azure.core.tracing package
==========================

Subpackages
-----------

.. toctree::

azure.core.tracing.ext

Submodules
----------

azure.core.tracing.abstract\_span module
----------------------------------------

.. automodule:: azure.core.tracing.abstract_span
:members:
:undoc-members:
:show-inheritance:

azure.core.tracing.common module
--------------------------------

.. automodule:: azure.core.tracing.common
:members:
:undoc-members:
:show-inheritance:

azure.core.tracing.decorator module
-----------------------------------

.. automodule:: azure.core.tracing.decorator
:members:
:undoc-members:
:show-inheritance:

azure.core.tracing.decorator\_async module
------------------------------------------

.. automodule:: azure.core.tracing.decorator_async
:members:
:undoc-members:
:show-inheritance:


Module contents
---------------

.. automodule:: azure.core.tracing
:members:
:undoc-members:
:show-inheritance:
8 changes: 8 additions & 0 deletions eng/pipelines/templates/stages/cosmos-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,11 @@ stages:
PythonVersion: $(PythonVersion)
OSName: $(OSName)
ToxTestEnv: 'whl,sdist'

# The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
- ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
- template: pipelines/stages/archetype-python-release.yml@azure-sdk-build-tools
parameters:
DependsOn: Build
Artifacts: ${{parameters.Artifacts}}
ArtifactName: packages
30 changes: 21 additions & 9 deletions sdk/appconfiguration/ci.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
# DO NOT EDIT THIS FILE
# This file is generated automatically and any changes will be lost.

resources:
repositories:
- repository: azure-sdk-tools
type: github
name: Azure/azure-sdk-tools
endpoint: azure
- repository: azure-sdk-build-tools
type: git
name: internal/azure-sdk-build-tools

trigger:
branches:
include:
- master
- feature/*
- hotfix/*
- release/*
- restapi*
paths:
include:
- sdk/appconfiguration/
- sdk/core/

pr:
branches:
Expand All @@ -20,15 +35,12 @@ pr:
paths:
include:
- sdk/appconfiguration/
- sdk/core/

resources:
repositories:
- repository: azure-sdk-tools
type: github
name: Azure/azure-sdk-tools
endpoint: azure

jobs:
- template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml
stages:
- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
parameters:
ServiceDirectory: appconfiguration
Artifacts:
- name: azure_appconfiguration
safeName: azureappconfiguration
12 changes: 12 additions & 0 deletions sdk/cosmos/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,22 @@ resources:
type: github
name: Azure/azure-sdk-tools
endpoint: azure
- repository: azure-sdk-build-tools
type: git
name: internal/azure-sdk-build-tools

trigger:
branches:
include:
- master
- feature/*
- hotfix/*
- release/*
- restapi*
paths:
include:
- sdk/cosmos/
- sdk/core/

pr:
branches:
Expand All @@ -27,8 +35,12 @@ pr:
paths:
include:
- sdk/cosmos/
- sdk/core/

stages:
- template: ../../eng/pipelines/templates/stages/cosmos-sdk-client.yml
parameters:
ServiceDirectory: cosmos
Artifacts:
- name: azure_cosmos
safeName: azurecosmos
32 changes: 22 additions & 10 deletions sdk/eventhub/ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
# DO NOT EDIT THIS FILE
# This file is generated automatically and any changes will be lost.

resources:
repositories:
- repository: azure-sdk-tools
type: github
name: Azure/azure-sdk-tools
endpoint: azure
- repository: azure-sdk-build-tools
type: git
name: internal/azure-sdk-build-tools

trigger:
branches:
include:
- master
- feature/*
- hotfix/*
- release/*
- restapi*
paths:
include:
- sdk/eventhub/
Expand All @@ -23,14 +37,12 @@ pr:
- sdk/eventhub/
- sdk/core/

resources:
repositories:
- repository: azure-sdk-tools
type: github
name: Azure/azure-sdk-tools
endpoint: azure

jobs:
- template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml
stages:
- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
parameters:
ServiceDirectory: eventhub
ServiceDirectory: eventhub
Artifacts:
- name: azure_eventhubs
safeName: azureeventhubs
- name: azure_eventhubs_checkpointstoreblob-aio
safeName: azureeventhubscheckpointstoreblobaio
30 changes: 20 additions & 10 deletions sdk/identity/ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
# DO NOT EDIT THIS FILE
# This file is generated automatically and any changes will be lost.

resources:
repositories:
- repository: azure-sdk-tools
type: github
name: Azure/azure-sdk-tools
endpoint: azure
- repository: azure-sdk-build-tools
type: git
name: internal/azure-sdk-build-tools

trigger:
branches:
include:
- master
- feature/*
- hotfix/*
- release/*
- restapi*
paths:
include:
- sdk/identity/
Expand All @@ -23,14 +37,10 @@ pr:
- sdk/identity/
- sdk/core/

resources:
repositories:
- repository: azure-sdk-tools
type: github
name: Azure/azure-sdk-tools
endpoint: azure

jobs:
- template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml
stages:
- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
parameters:
ServiceDirectory: identity
ServiceDirectory: identity
Artifacts:
- name: azure_identity
safeName: azureidentity
6 changes: 6 additions & 0 deletions sdk/keyvault/azure-keyvault-keys/HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# Release History

## 4.0.0b4
### Breaking changes:
- Enums 'JsonWebKeyCurveName', 'JsonWebKeyOperation', and 'JsonWebKeyType' have
been renamed to 'KeyCurveName', 'KeyOperation', and 'KeyType', respectively.

### Fixes and improvements:
- The `key` argument to `import_key` should be an instance of `azure.keyvault.keys.JsonWebKey`
([#7590](https://github.com/Azure/azure-sdk-for-python/pull/7590))


## 4.0.0b3 (2019-09-11)
### Breaking changes:
- `CryptographyClient` methods `wrap` and `unwrap` are renamed `wrap_key` and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
# -------------------------------------
from .client import KeyClient
from .enums import KeyCurveName, KeyOperation, KeyType
from .models import JsonWebKey

__all__ = ["KeyCurveName", "KeyOperation", "KeyType", "KeyClient"]
__all__ = ["JsonWebKey", "KeyCurveName", "KeyOperation", "KeyType", "KeyClient"]
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,6 @@ async def import_key(
else:
attributes = None
bundle = await self._client.import_key(
self.vault_url, name, key=key, hsm=hsm, key_attributes=attributes, tags=tags, **kwargs
self.vault_url, name, key=key._to_generated_model(), hsm=hsm, key_attributes=attributes, tags=tags, **kwargs
)
return Key._from_key_bundle(bundle)
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from typing import Any, Dict, List, Optional, Union
from datetime import datetime
from azure.core.paging import ItemPaged
from .models import JsonWebKey


class KeyClient(KeyVaultClientBase):
Expand Down Expand Up @@ -530,7 +531,7 @@ def restore_key(self, backup, **kwargs):
def import_key(
self,
name, # type: str
key, # type: List[str]
key, # type: JsonWebKey
hsm=None, # type: Optional[bool]
enabled=None, # type: Optional[bool]
not_before=None, # type: Optional[datetime]
Expand Down Expand Up @@ -560,6 +561,6 @@ def import_key(
else:
attributes = None
bundle = self._client.import_key(
self.vault_url, name, key=key, hsm=hsm, key_attributes=attributes, tags=tags, **kwargs
self.vault_url, name, key=key._to_generated_model(), hsm=hsm, key_attributes=attributes, tags=tags, **kwargs
)
return Key._from_key_bundle(bundle)
Loading