Skip to content

Commit

Permalink
Update from master
Browse files Browse the repository at this point in the history
  • Loading branch information
SDK Automation committed May 15, 2020
1 parent 6bb06a7 commit a638668
Show file tree
Hide file tree
Showing 91 changed files with 9,607 additions and 2,729 deletions.
16 changes: 8 additions & 8 deletions src/logic/HISTORY.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.. :changelog:
Release History
===============

0.1.0
++++++
* Initial release.
.. :changelog:
Release History
===============

0.1.0
++++++
* Initial release.
68 changes: 5 additions & 63 deletions src/logic/README.md
Original file line number Diff line number Diff line change
@@ -1,63 +1,5 @@
# Azure CLI Logic Apps Extension #
This package is for the 'logic app' extension, i.e. 'az logic'.
More info on what is [Logic](https://docs.microsoft.com/en-us/azure/logic-apps/logic-apps-overview).

### How to use ###
Install this extension using the below CLI command
```
az extension add --name logic
```

### Getting Help

To see examples of commands and parameters details got commands or command groups, one should run the command of interest with a -h

Examples:
```
az logic workflow create -h
az logic integration-account -h
az logic worflow update -h
```


##### Creating a Logic App

For creating a logic app, one must provide a logic app definition.
A definition is a JSON description of a logic app workflow. It is recommended that the logic app designer be used to create this definition, as these definitions can be very complex depending on a workflow. The designed tool works with VS Code, Visual Studio, and Azure Portal: https://docs.microsoft.com/en-us/azure/logic-apps/.

Access Controls: For a great reference on this see: (https://msftplayground.com/2020/02/managing-access-control-for-logic-apps/)
An example of how an access control would look is:

```json
"accessControl": { "triggers":
{ "allowedCallerIpAddresses":
[{ "addressRange": "10.0.0.0/24" }]},
"actions": { "allowedCallerIpAddresses":
[{ "addressRange": "10.0.0.0/24" }]}
}
```
##### Creating an Integration Account

Integration accounts are a way for Azure Logic Apps to utilize services outside of Azure to integrate into your logic app workflows. See (https://docs.microsoft.com/en-us/azure/logic-apps/logic-apps-enterprise-integration-create-integration-account) for more information.

Integration Service enviroments go hand in hand with a integration account. It is enviroment that connects to your azure vnet for seamless flow of data and logic apps services to on premise enviroments and services. See (https://azure.microsoft.com/en-us/blog/announcing-azure-integration-service-environment-for-logic-apps/) for more information


#### Import an Integration Account

You can import an integration account from a JSON file. Run az workflow integration-account import -h to see the parameters.

An example JSON for import could look like:

```json
{"properties": {
"state": "Enabled"
},
"sku": {
"name": "Standard"
},
"location": "centralus"
}
'''
Microsoft Azure CLI 'logic' Extension
==========================================

This package is for the 'logic' extension.
i.e. 'az logic'
87 changes: 46 additions & 41 deletions src/logic/azext_logic/__init__.py
Original file line number Diff line number Diff line change
@@ -1,41 +1,46 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

from azure.cli.core import AzCommandsLoader
from azext_logic.generated._help import helps # pylint: disable=unused-import


class LogicManagementClientCommandsLoader(AzCommandsLoader):

def __init__(self, cli_ctx=None):
from azure.cli.core.commands import CliCommandType
from azext_logic.generated._client_factory import cf_logic
logic_custom = CliCommandType(
operations_tmpl='azext_logic.custom#{}',
client_factory=cf_logic)
super(LogicManagementClientCommandsLoader, self).__init__(cli_ctx=cli_ctx,
custom_command_type=logic_custom)

def load_command_table(self, args):
from azext_logic.generated.commands import load_command_table
load_command_table(self, args)
try:
from azext_logic.manual.commands import load_command_table as load_command_table_manual
load_command_table_manual(self, args)
except ImportError:
pass
return self.command_table

def load_arguments(self, command):
from azext_logic.generated._params import load_arguments
load_arguments(self, command)
try:
from azext_logic.manual._params import load_arguments as load_arguments_manual
load_arguments_manual(self, command)
except ImportError:
pass


COMMAND_LOADER_CLS = LogicManagementClientCommandsLoader
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

from azure.cli.core import AzCommandsLoader
from azext_logic.generated._help import helps # pylint: disable=unused-import


class LogicManagementClientCommandsLoader(AzCommandsLoader):

def __init__(self, cli_ctx=None):
from azure.cli.core.commands import CliCommandType
from azext_logic.generated._client_factory import cf_logic
logic_custom = CliCommandType(
operations_tmpl='azext_logic.custom#{}',
client_factory=cf_logic)
super(LogicManagementClientCommandsLoader, self).__init__(cli_ctx=cli_ctx,
custom_command_type=logic_custom)

def load_command_table(self, args):
from azext_logic.generated.commands import load_command_table
load_command_table(self, args)
try:
from azext_logic.manual.commands import load_command_table as load_command_table_manual
load_command_table_manual(self, args)
except ImportError:
pass
return self.command_table

def load_arguments(self, command):
from azext_logic.generated._params import load_arguments
load_arguments(self, command)
try:
from azext_logic.manual._params import load_arguments as load_arguments_manual
load_arguments_manual(self, command)
except ImportError:
pass


COMMAND_LOADER_CLS = LogicManagementClientCommandsLoader
29 changes: 17 additions & 12 deletions src/logic/azext_logic/action.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
# pylint: disable=wildcard-import
# pylint: disable=unused-wildcard-import

from .generated.action import * # noqa: F403
try:
from .manual.action import * # noqa: F403
except ImportError:
pass
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
# pylint: disable=wildcard-import
# pylint: disable=unused-wildcard-import

from .generated.action import * # noqa: F403
try:
from .manual.action import * # noqa: F403
except ImportError:
pass
8 changes: 4 additions & 4 deletions src/logic/azext_logic/azext_metadata.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"azext.isExperimental": true,
"azext.minCliCoreVersion": "2.3.1"
}
{
"azext.isExperimental": true,
"azext.minCliCoreVersion": "2.3.1"
}
29 changes: 17 additions & 12 deletions src/logic/azext_logic/custom.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
# pylint: disable=wildcard-import
# pylint: disable=unused-wildcard-import

from .generated.custom import * # noqa: F403
try:
from .manual.custom import * # noqa: F403
except ImportError:
pass
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
# pylint: disable=wildcard-import
# pylint: disable=unused-wildcard-import

from .generated.custom import * # noqa: F403
try:
from .manual.custom import * # noqa: F403
except ImportError:
pass
24 changes: 12 additions & 12 deletions src/logic/azext_logic/generated/__init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

__path__ = __import__('pkgutil').extend_path(__path__, __name__)
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

__path__ = __import__('pkgutil').extend_path(__path__, __name__)
Loading

0 comments on commit a638668

Please sign in to comment.