Revert "small edits to lease client docs (#7550)" (#7631)

This reverts commit ed20b58.
Azure · zezha-msft · Oct 8, 2019 · Sep 19, 2019 · Sep 19, 2019 · Sep 23, 2019
commit 62774ebd4e20a440a8cd2451d94c0ab7af40eea5
diff --git a/doc/sphinx/ref/azure.core.pipeline.policies.rst b/doc/sphinx/ref/azure.core.pipeline.policies.rst
@@ -44,14 +44,6 @@ 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,7 +8,6 @@ Subpackages
 
    azure.core.pipeline
    azure.core.polling
-   azure.core.tracing
 
 Submodules
 ----------
@@ -53,14 +52,6 @@ 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
diff --git a/doc/sphinx/ref/azure.core.tracing.rst b/doc/sphinx/ref/azure.core.tracing.rst
diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -42,11 +42,3 @@ 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,28 +1,13 @@
 # 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:
@@ -35,12 +20,15 @@ pr:
   paths:
     include:
     - sdk/appconfiguration/
-    - sdk/core/
 
-stages:
-- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+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
   parameters:
     ServiceDirectory: appconfiguration
-    Artifacts:
-    - name: azure_appconfiguration
-      safeName: azureappconfiguration
diff --git a/sdk/cosmos/ci.yml b/sdk/cosmos/ci.yml
@@ -7,22 +7,14 @@ 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:
@@ -35,12 +27,8 @@ 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,24 +1,10 @@
 # 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/
@@ -37,12 +23,14 @@ pr:
     - sdk/eventhub/
     - sdk/core/
 
-stages:
-- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+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
   parameters:
-    ServiceDirectory: eventhub
-    Artifacts:
-    - name: azure_eventhubs
-      safeName: azureeventhubs
-    - name: azure_eventhubs_checkpointstoreblob-aio
-      safeName: azureeventhubscheckpointstoreblobaio
+    ServiceDirectory: eventhub
diff --git a/sdk/identity/ci.yml b/sdk/identity/ci.yml
@@ -1,24 +1,10 @@
 # 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/
@@ -37,10 +23,14 @@ pr:
     - sdk/identity/
     - sdk/core/
 
-stages:
-- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+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
   parameters:
-    ServiceDirectory: identity
-    Artifacts:
-    - name: azure_identity
-      safeName: azureidentity
+    ServiceDirectory: identity
diff --git a/sdk/keyvault/azure-keyvault-keys/HISTORY.md b/sdk/keyvault/azure-keyvault-keys/HISTORY.md
@@ -1,15 +1,9 @@
 # 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,6 +4,5 @@
 # -------------------------------------
 from .client import KeyClient
 from .enums import KeyCurveName, KeyOperation, KeyType
-from .models import JsonWebKey
 
-__all__ = ["JsonWebKey", "KeyCurveName", "KeyOperation", "KeyType", "KeyClient"]
+__all__ = ["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._to_generated_model(), hsm=hsm, key_attributes=attributes, tags=tags, **kwargs
+            self.vault_url, name, key=key, 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,7 +19,6 @@
     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):
@@ -531,7 +530,7 @@ def restore_key(self, backup, **kwargs):
     def import_key(
         self,
         name,  # type: str
-        key,  # type: JsonWebKey
+        key,  # type: List[str]
         hsm=None,  # type: Optional[bool]
         enabled=None,  # type: Optional[bool]
         not_before=None,  # type: Optional[datetime]
@@ -561,6 +560,6 @@ def import_key(
         else:
             attributes = None
         bundle = self._client.import_key(
-            self.vault_url, name, key=key._to_generated_model(), hsm=hsm, key_attributes=attributes, tags=tags, **kwargs
+            self.vault_url, name, key=key, hsm=hsm, key_attributes=attributes, tags=tags, **kwargs
         )
         return Key._from_key_bundle(bundle)