small edits to lease client docs (Azure#7550)

* small edits to lease client docs * whitespace * Setup identity for unified pipelines. (Azure#7578) * Setup keyvault for unified pipelines. (Azure#7579) * Setup eventhubs for publishing via unified pipelines. (Azure#7580) * Setup eventhubs for publishing via unified pipelines. * Fixed missing punctuation. * Setup cosmos for release via unified pipelines. (Azure#7581) * bump CI * Manual network september (Azure#7576) * generated files * adding 2019-07-01 * history and version * rerun tests * updated version * removed subscription id from tests * rerun tests again * replaced subscription id * [AutoPR] reservations/resource-manager (Azure#7569) * [AutoPR reservations/resource-manager] [Hub Generated] Review request for Microsoft.Capacity to add version preview/2019-04-01 (Azure#7251) * Generated from f19a2e5b7f384018b74b21b7b8b8782d95b456f9 fixed x-ms-enum value * Generated from 2f56008117d578bec6cc8b8c832926f45a0fe52e fixed catalog definition * Generated from cac978330e8c7b9583812a735cfeac97fb267056 reverted breaking operation id change * added version and history * [AutoPR] sql/resource-manager (Azure#7535) * Generated from 9402dbf3fb3d5fffcb80f501b1fc857ff97ab723 (Azure#7329) Fixing PR validation errors * regenerated * history and version * Setup app configuration with unified pipelines. (Azure#7582) * [AutoPR] resources/resource-manager (Azure#7549) * regenerated * updated history and version * updated date * Correct import_key parameter type (Azure#7590) * add doc for tracing (Azure#7616)
YijunXieMS · Oct 4, 2019 · ed20b58 · ed20b58
1 parent 61b6388
commit ed20b58
Show file tree

Hide file tree

Showing 187 changed files with 76,657 additions and 8,874 deletions.
diff --git a/doc/sphinx/ref/azure.core.pipeline.policies.rst b/doc/sphinx/ref/azure.core.pipeline.policies.rst
@@ -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
 --------------------------------------------
 

diff --git a/doc/sphinx/ref/azure.core.rst b/doc/sphinx/ref/azure.core.rst
@@ -8,6 +8,7 @@ Subpackages
 
    azure.core.pipeline
    azure.core.polling
+   azure.core.tracing
 
 Submodules
 ----------
@@ -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
 ------------------------
 

diff --git a/doc/sphinx/ref/azure.core.tracing.ext.rst b/doc/sphinx/ref/azure.core.tracing.ext.rst
@@ -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:
diff --git a/doc/sphinx/ref/azure.core.tracing.rst b/doc/sphinx/ref/azure.core.tracing.rst
@@ -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:
diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -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
diff --git a/sdk/appconfiguration/ci.yml b/sdk/appconfiguration/ci.yml
@@ -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:
@@ -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
diff --git a/sdk/cosmos/ci.yml b/sdk/cosmos/ci.yml
@@ -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:
@@ -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
diff --git a/sdk/eventhub/ci.yml b/sdk/eventhub/ci.yml
@@ -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/
@@ -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
diff --git a/sdk/identity/ci.yml b/sdk/identity/ci.yml
@@ -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/
@@ -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
diff --git a/sdk/keyvault/azure-keyvault-keys/HISTORY.md b/sdk/keyvault/azure-keyvault-keys/HISTORY.md
@@ -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

diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/__init__.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/__init__.py
@@ -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"]
diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/aio/client.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/aio/client.py
@@ -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)
diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/client.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/client.py
@@ -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):
@@ -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]
@@ -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)