Adjustment to fit existing MS name.

.travis.yml

@@ -3,6 +3,7 @@ language: python
 python:
   - 3.5
   - 3.6
+  - 3.7
 
 install:
   - pip install -r requirements.txt -r requirements-dev.txt

CHANGELOG.md

@@ -1,7 +1,79 @@
 # Changelog
 
 ## [Unreleased][]
-[Unreleased]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.5.0...HEAD
+[Unreleased]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.8.3...HEAD
+
+### Added
+
+-   Individual Azure managemnt clients for website and compute resources
+
+### Removed
+
+-   Removed common init_client
+
+## [0.8.3][] - 2020-05-14
+
+[0.8.3]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.8.2...0.8.3
+
+### Added
+
+-   Missing init module files
+
+## [0.8.2][] - 2020-05-14
+
+[0.8.2]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.8.1...0.8.2
+
+### Changed
+
+-   Letting setuptools find all packages
+
+## [0.8.1][] - 2020-05-14
+
+[0.8.1]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.8.0...0.8.1
+
+### Added
+
+-   Expose the `auth` and `common` packages on building the top-level package
+
+## [0.8.0][] - 2020-05-14
+
+[0.8.0]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.7.0...0.8.0
+
+### Added
+- Return output from activities
+- Allow user to load more than one VMSS instance for VMSS actions
+- Update list of unsupported scripts for Windows VM
+- Added network latency operation vor VMSS instances
+- Added burn io (memory exploit) operation vor VMSS instances
+- Added fill disk operation vor VMSS instances
+- Interrupt an experiment execution when secrets are error-prone
+- Interrupt an experiment execution when an invalid cloud is configured
+- Remove an unused configuration property from the resource graph since it is deprecated
+- Technical refactoring: Separate concerns from the main _init_ module
+- Technical refactoring: Applied DRY principles in test module
+- Technical refactoring: Resource graph client now outputs error messages
+- Allow to load secrets from azure credential file
+
+## [0.7.0][] - 2020-04-09
+
+[0.7.0]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.6.0...0.7.0
+
+### Added
+
+- Supporting criteria for selection of the virtual machine scale set instance to stop
+- Added optional path parameter to fill_disk
+
+### Changed
+
+- Use the official configuration accessor for `subscription_id` [#91][91]
+
+[91]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/issues/91
+
+## [0.6.0][] - 2019-11-12
+
+[0.6.0]: https://github.com/chaostoolkit-incubator/chaostoolkit-azure/compare/0.5.0...0.6.0
+
+### Added
 
 - Added the burn_io feature: increase the I/O operations per seconds of the 
 hard drive for a time period (default time period is 1 minute). Works by 
@@ -10,6 +82,10 @@ script.
 - Added the network_latency feature: disturb the network of the VM, adding some
  latency for a time period (defaults to a 200 +/- 50ms latency for 1 minute).
   Only works on Linux machines for now.
+- Supporting multiple Azure Cloud, such as AZURE_CHINA_CLOUD.
+- Code clean up and refactoring, moving up client initiation.
+- Added the ability to stress a machine instance in a virtual machine scale set
+- Supporting Azure token based credentials (no refresh token support yet)
 
 ## [0.5.0][] - 2019-07-05
 

MANIFEST.in

@@ -4,4 +4,4 @@ include requirements-dev.txt
 include LICENSE
 include CHANGELOG.md
 include pytest.ini
-include chaosazure/machine/scripts/*
+include chaosazure/common/scripts/*

README.md

@@ -30,103 +30,160 @@ experiment file:
 
 ```json
 {
-    "type": "action",
-    "name": "start-service-factory-chaos",
-    "provider": {
-        "type": "python",
-        "module": "chaosazure.vm.actions",
-        "func": "stop_machines",
-        "secrets": ["azure"],
-        "arguments": {
-            "parameters": {
-                "TimeToRunInSeconds": 45
-            }
-        }
+  "type": "action",
+  "name": "start-service-factory-chaos",
+  "provider": {
+    "type": "python",
+    "module": "chaosazure.vm.actions",
+    "func": "stop_machines",
+    "secrets": ["azure"],
+    "arguments": {
+      "parameters": {
+        "TimeToRunInSeconds": 45
+      }
     }
+  }
 }
 ```
 
 That's it!
 
 Please explore the code to see existing probes and actions.
 
+## Configuration
 
+This extension uses the [Azure SDK][sdk] libraries under the hood. The Azure SDK library expects that you have a tenant and client identifier, as well as a client secret and subscription, that allows you to authenticate with the Azure resource management API.
 
-## Configuration
+Configuration values for the Chaos Toolkit Extension for Azure can come from several sources:
 
-### Credentials
-This extension uses the [Azure SDK][sdk] libraries under the hood. The Azure SDK library
-expects that you have a tenant and client identifier, as well as a client secret and subscription, that allows you to 
-authenticate with the Azure resource management API.
+- Experiment file
+- Azure credential file
+
+The extension will first try to load the configuration from the `experiment file`. If configuration is not provided in the `experiment file`, it will try to load it from the `Azure credential file`.
 
 [creds]: https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-connect-to-secure-cluster
 [requests]: http://docs.python-requests.org/en/master/
 [sdk]: https://github.com/Azure/azure-sdk-for-python
 
-There are two ways of doing this:
+### Credentials
 
-* you can either pass the name of the environment variables to the experiment definition as follows (recommended):
+- Secrets in the Experiment file
 
-    ```json
-    {
-        "azure": {
-            "client_id": {
-                "type": "env",
-                "key": "AZURE_CLIENT_ID"
-            },
-            "client_secret": {
-                "type": "env",
-                "key": "AZURE_CLIENT_SECRET"
-            },
-            "tenant_id": {
-                "type": "env",
-                "key": "AZURE_TENANT_ID"
-            }
-        }
+  ```json
+  {
+    "secrets": {
+      "azure": {
+        "client_id": "your-super-secret-client-id",
+        "client_secret": "your-even-more-super-secret-client-secret",
+        "tenant_id": "your-tenant-id"
+      }
     }
-    ```
-
-* or you inject the secrets explicitly to the experiment definition:
+  }
+  ```
 
-    ```json
-    {
-        "azure": {
-            "client_id": "your-super-secret-client-id",
-            "client_secret": "your-even-more-super-secret-client-secret",
-            "tenant_id": "your-tenant-id"
-        }
+  You can retrieve secretes as well from [environment][env_secrets] or [HashiCorp vault][vault_secrets]. 
+
+
+  If you are not working with Public Global Azure, e.g. China Cloud You can set the cloud environment.
+
+  ```json
+  {
+    "client_id": "your-super-secret-client-id",
+    "client_secret": "your-even-more-super-secret-client-secret",
+    "tenant_id": "your-tenant-id",
+    "azure_cloud": "AZURE_CHINA_CLOUD"
+  }
+  ```
+
+  Available cloud names:
+
+  - AZURE_CHINA_CLOUD
+  - AZURE_GERMAN_CLOUD
+  - AZURE_PUBLIC_CLOUD
+  - AZURE_US_GOV_CLOUD
+
+  [vault_secrets]: https://docs.chaostoolkit.org/reference/api/experiment/#vault-secrets
+  [env_secrets]: https://docs.chaostoolkit.org/reference/api/experiment/#environment-secrets
+
+
+- Secrets in the Azure credential file
+
+  You can retrieve a credentials file with your subscription ID already in place by signing in to Azure using the az login command followed by the az ad sp create-for-rbac command
+
+  ```bash
+  az login
+  az ad sp create-for-rbac --sdk-auth > credentials.json
+  ```
+
+  credentials.json:
+
+  ```json
+  {
+    "subscriptionId": "<azure_aubscription_id>",
+    "tenantId": "<tenant_id>",
+    "clientId": "<application_id>",
+    "clientSecret": "<application_secret>",
+    "activeDirectoryEndpointUrl": "https://login.microsoftonline.com",
+    "resourceManagerEndpointUrl": "https://management.azure.com/",
+    "activeDirectoryGraphResourceId": "https://graph.windows.net/",
+    "sqlManagementEndpointUrl": "https://management.core.windows.net:8443/",
+    "galleryEndpointUrl": "https://gallery.azure.com/",
+    "managementEndpointUrl": "https://management.core.windows.net/"
+  }
+  ```
+
+  Store the path to the file in an environment variable called **AZURE_AUTH_LOCATION** and make sure that your experiment does **NOT** contain `secrets` section. 
+
+### Subscription
+
+Additionally you need to provide the Azure subscription id.
+
+- Subscription id in the experiment file
+
+  ```json
+  {
+    "configuration": {
+      "azure_subscription_id": "your-azure-subscription-id"
     }
-    ```
-
-    Additionally you need to provide the Azure subscription id.
+  }
+  ```
 
-    ```json
-    {
-        "azure": {
-            "subscription_id": "your-azure-subscription-id"
-        }
+  Configuration may be as well retrieved from an [environment][env_configuration].
+
+  An old, but deprecated way of doing it was as follows, this still works
+  but should not be favoured over the previous approaches as it's not the
+  Chaos Toolkit way to pass structured configurations.
+
+  ```json
+  {
+    "configuration": {
+      "azure": {
+        "subscription_id": "your-azure-subscription-id"
+      }
     }
-    ```
+  }
+  ```
+
+  [env_configuration]: https://docs.chaostoolkit.org/reference/api/experiment/#environment-configurations
+
+- Subscription id in the Azure credential file
+
+  Credential file described in the previous "Credential" section contains as well subscription id. If **AZURE_AUTH_LOCATION** is set and subscription id is **NOT** set in the experiment definition, extension will try to load it from the credential file.
+
+
 
 ### Putting it all together
 
-Here is a full example:
+Here is a full example for an experiment containing secrets and configuration: 
 
 ```json
 {
   "version": "1.0.0",
   "title": "...",
   "description": "...",
-  "tags": [
-    "azure",
-    "kubernetes",
-	"aks",
-	"node"
-  ],
+  "tags": ["azure", "kubernetes", "aks", "node"],
   "configuration": {
-    "azure": {
-      "subscription_id": "xxx"
-	}
+    "azure_subscription_id": "xxx"
   },
   "secrets": {
     "azure": {
@@ -157,18 +214,12 @@ Here is a full example:
         "type": "python",
         "module": "chaosazure.machine.actions",
         "func": "restart_machines",
-        "secrets": [
-          "azure"
-        ],
-        "config": [
-          "azure"
-        ]
+        "secrets": ["azure"],
+        "config": ["azure_subscription_id"]
       }
     }
   ],
-  "rollbacks": [
-
-  ]
+  "rollbacks": []
 }
 ```
 
@@ -197,7 +248,7 @@ those dependencies.
 [venv]: http://chaostoolkit.org/reference/usage/install/#create-a-virtual-environment
 
 ```console
-$ pip install -r requirements-dev.txt -r requirements.txt 
+$ pip install -r requirements-dev.txt -r requirements.txt
 ```
 
 Then, point your environment to this directory: