Skip to content

Commit

Permalink
Revert shortened arguement for resource group
Browse files Browse the repository at this point in the history
  • Loading branch information
almasak committed Jul 10, 2024
1 parent f31c5c7 commit e60154d
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -237,7 +236,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
help="The geo-location where the resource lives",
required=True,
fmt=AAZResourceLocationArgFormat(
resource_group_arg="rg",
resource_group_arg="resource_group",
),
)
_args_schema.tags = AAZDictArg(
Expand Down Expand Up @@ -317,7 +316,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -131,7 +130,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -108,7 +107,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -108,7 +107,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,15 @@ def _build_arguments_schema(cls, *args, **kwargs):
# define Arg Group ""

_args_schema = cls._args_schema
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
)
return cls._args_schema

def _execute_operations(self):
self.pre_operations()
condition_0 = has_value(self.ctx.args.rg) and has_value(self.ctx.subscription_id)
condition_1 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.rg) is not True
condition_0 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
condition_1 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
if condition_0:
self.OrganizationsListByResourceGroup(ctx=self.ctx)()
if condition_1:
Expand Down Expand Up @@ -102,7 +101,7 @@ def error_format(self):
def url_parameters(self):
parameters = {
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -108,7 +107,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -329,7 +328,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down Expand Up @@ -428,7 +427,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -107,7 +106,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -117,7 +116,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -340,7 +339,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -140,7 +139,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -109,7 +108,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -117,7 +116,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -113,7 +112,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -358,7 +357,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down Expand Up @@ -461,7 +460,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -116,7 +115,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
pattern="^[a-zA-Z0-9_-]*$",
),
)
_args_schema.rg = AAZResourceGroupNameArg(
options=["--rg"],
_args_schema.resource_group = AAZResourceGroupNameArg(
help="Resource group name",
required=True,
)
Expand Down Expand Up @@ -117,7 +116,7 @@ def url_parameters(self):
required=True,
),
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.rg,
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
Expand Down

0 comments on commit e60154d

Please sign in to comment.