Skip to content

[Service Fabric] az sf managed-cluster network-security-rule add: Add command to add network security rule to managed cluster #26510

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.

Sign up for GitHub

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

Merged
yanzhudd merged 18 commits into from
Jun 28, 2023
Merged

[Service Fabric] az sf managed-cluster network-security-rule add: Add command to add network security rule to managed cluster #26510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1b91fa5
adding command to add network security rule to managed cluster
mwesigwaguma May 23, 2023
cc7f407
Merge branch 'main' of https://github.com/Azure/azure-cli into addnet…
mwesigwaguma May 23, 2023
bb7c506
Updaing tests
mwesigwaguma Jun 6, 2023
66bd0d5
Changing parameters to snake_case
mwesigwaguma Jun 20, 2023
718363d
Updating network_security_rule test
mwesigwaguma Jun 21, 2023
e68d7df
updating help
mwesigwaguma Jun 21, 2023
cbe1ecf
updaing options list for command lines parameters
mwesigwaguma Jun 21, 2023
dd71a10
updating help to follow linting rules
mwesigwaguma Jun 21, 2023
0a8c717
updates
mwesigwaguma Jun 22, 2023
35710cc
updating options_list in parameters to fix unrecognized error
mwesigwaguma Jun 23, 2023
b0d7068
adding session recording
mwesigwaguma Jun 23, 2023
4bc1ba3
Fixing lint errors
mwesigwaguma Jun 23, 2023
c032c76
adding group help
mwesigwaguma Jun 23, 2023
45373e2
Updating check
mwesigwaguma Jun 26, 2023
31f9f6f
Updating option names. Specifying default options name is redundant
mwesigwaguma Jun 26, 2023
6e08961
Fixing typo
mwesigwaguma Jun 26, 2023
5f2c071
add enumerations to protocol, access and direction parameters
mwesigwaguma Jun 27, 2023
29e6d32
removing whitespace in blank space
mwesigwaguma Jun 27, 2023
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
15 changes: 15 additions & 0 deletions src/azure-cli/azure/cli/command_modules/servicefabric/_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,21 @@
az sf managed-cluster client-certificate delete -g testRG -c testCluster --common-name Contoso.com
"""

helps['sf managed-cluster network-security-rule'] = """
type: group
short-summary: network security rule of a manged cluster.
"""

helps['sf managed-cluster network-security-rule add'] = """
type: command
short-summary: Add a network security rule to a manged cluster.
examples:
- name: Add network security rule.
text: >
az sf managed-cluster network-security-rule add -g testRG -c testCluster --name 'network security rule name' --access allow --description 'network security rule description' --direction inbound --protocol tcp --priority 1200 \
--source-port-ranges 1-1000 --dest-port-ranges 1-65535 --source-addr-prefixes 167.220.242.0/27 167.220.0.0/23 131.107.132.16/28 167.220.81.128/26 --dest-addr-prefixes 194.69.104.0/25 194.69.119.64/26 167.220.249.128/26 255.255.255.255/32
"""

helps['sf managed-node-type'] = """
type: group
short-summary: Manage a node type of an Azure Service Fabric managed cluster.
Expand Down
16 changes: 14 additions & 2 deletions src/azure-cli/azure/cli/command_modules/servicefabric/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
validate_create_service, validate_update_application,
validate_update_managed_application, validate_update_managed_service,
validate_create_managed_service_correlation, validate_create_managed_service_load_metric,
validate_update_managed_service_load_metric, validate_update_managed_service_correlation)
validate_update_managed_service_load_metric, validate_update_managed_service_correlation,
validate_add_network_security_rule)
from azure.cli.core.commands.parameters import (get_enum_type,
get_three_state_flag,
resource_group_name_type,
Expand Down Expand Up @@ -278,8 +279,19 @@ def load_arguments(self, _): # pylint: disable=too-many-statements
c.argument('thumbprint', nargs='+', help='A single or Space-separated list of client certificate thumbprint(s) to be remove.')
c.argument('common_name', nargs='+', help='A single or Space-separated list of client certificate common name(s) to be remove.')

# managed node type
with self.argument_context('sf managed-cluster network-security-rule add', validator=validate_add_network_security_rule) as c:
c.argument('name', help='Network security rule name')
c.argument('access', arg_type=get_enum_type(['allow', 'deny']), help='Allows or denies network traffic')
c.argument('direction', arg_type=get_enum_type(['inbound', 'outbound']), help='Network security rule direction')
c.argument('description', help='Network security rule description')
c.argument('priority', type=int, help='Integer that shows priority for rule')
c.argument('protocol', arg_type=get_enum_type(['tcp', 'https', 'http', 'udp', 'icmp', 'ah', 'esp', 'any']), help='Network protocol')
c.argument('source_port_ranges', nargs='+', help='A single or space separated list of source port ranges')
c.argument('dest_port_ranges', nargs='+', help='A single or space separated list of destination port ranges')
c.argument('source_addr_prefixes', nargs='+', help='The CIDR or source IP ranges. A single or space separated list of source address prefixes')
c.argument('dest_addr_prefixes', nargs='+', help='CIDR or destination IP ranges. A single or space separated list of destination address prefixes')

# managed node type
capacity = CLIArgumentType(
options_list=['--capacity'],
action=AddNodeTypeCapacityAction,
Expand Down
9 changes: 9 additions & 0 deletions src/azure-cli/azure/cli/command_modules/servicefabric/_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,15 @@ def validate_create_managed_cluster(cmd, namespace):
raise CLIError("--upgrade-cadence should only be used whe --upgrade-mode is set to 'Automatic'.")


def validate_add_network_security_rule(cmd, namespace):
client = servicefabric_managed_client_factory(cmd.cli_ctx)
cluster = _safe_get_resource(client.managed_clusters.get,
(namespace.resource_group_name, namespace.cluster_name))

if cluster is None or cluster.cluster_state != 'Ready':
raise ValidationError("cluster state is invalid for this operation")


def validate_create_managed_service(namespace):
validate_tags(namespace)
if namespace.service_type is None:
Expand Down
4 changes: 4 additions & 0 deletions src/azure-cli/azure/cli/command_modules/servicefabric/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@ def load_command_table(self, _):
g.custom_command('add', 'add_client_cert')
g.custom_command('delete', 'delete_client_cert')

with self.command_group('sf managed-cluster network-security-rule', managed_cluster_mgmt,
custom_command_type=managed_cluster_custom_type) as g:
g.custom_command('add', 'add_network_security_rule')

with self.command_group('sf managed-node-type', node_type_mgmt,
custom_command_type=managed_node_type_custom_type) as g:
g.command('list', 'list_by_managed_clusters')
Expand Down
41 changes: 41 additions & 0 deletions src/azure-cli/azure/cli/command_modules/servicefabric/operations/managed_clusters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
_create_resource_group_name
)
from azure.mgmt.servicefabricmanagedclusters.models import (
NetworkSecurityRule,
ManagedCluster,
Sku,
ClientCertificate
Expand Down Expand Up @@ -206,3 +207,43 @@ def _get_resource_group_location(cli_ctx, resource_group_name):
resource_client = resource_client_factory(cli_ctx).resource_groups
rg = resource_client.get(resource_group_name)
return rg.location


def add_network_security_rule(cmd,
client,
resource_group_name,
cluster_name,
name=None,
access=None,
description=None,
direction=None,
protocol=None,
priority=None,
source_port_ranges=None,
dest_port_ranges=None,
dest_addr_prefixes=None,
source_addr_prefixes=None):
try:
cluster = client.managed_clusters.get(resource_group_name, cluster_name)

if cluster.network_security_rules is None:
cluster.network_security_rules = []

new_network_securityRule = NetworkSecurityRule(name=name,
access=access,
description=description,
direction=direction,
protocol='*' if protocol == 'any' else protocol,
priority=priority,
source_port_ranges=source_port_ranges,
destination_port_ranges=dest_port_ranges,
destination_address_prefixes=dest_addr_prefixes,
source_address_prefixes=source_addr_prefixes)

cluster.network_security_rules.append(new_network_securityRule)

poller = client.managed_clusters.begin_create_or_update(resource_group_name, cluster_name, cluster)
return LongRunningOperation(cmd.cli_ctx)(poller)
except HttpResponseError as ex:
logger.error("HttpResponseError: %s", ex)
raise
Loading