addressed comments and added scenario tests

Author: Srinivas Alluri

src/neon/azext_neon/aaz/latest/neon/postgres/branch/_create.py

@@ -18,7 +18,7 @@ class Create(AAZCommand):
     """Create a Branch
 
     :example: Create a Branch
-        az neon postgres branch create --resource-group rgneon --organization-name org-cli-test --project-name old-frost-16758796 --project-id old-frost-16758796 --branch-name test-branch --entity-name test-branch --role-name test_role --database-name testneondb
+        az neon postgres branch create --resource-group rgneon --organization-name org-cli-test --project-name old-frost-16758796 --branch-name test-branch --entity-name test-branch --role-name test_role --database-name testneondb
     """
 
     _aaz_info = {
@@ -50,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             help="The name of the Branch",
             required=True,
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.organization_name = AAZStrArg(
@@ -68,7 +68,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             help="The Id of the Neon Project.",
             required=True,
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(

src/neon/azext_neon/aaz/latest/neon/postgres/branch/_delete.py

@@ -51,7 +51,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
             id_part="child_name_2",
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.organization_name = AAZStrArg(
@@ -71,7 +71,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
             id_part="child_name_1",
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(

src/neon/azext_neon/aaz/latest/neon/postgres/branch/_list.py

@@ -60,7 +60,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             help="The id of the Neon Project resource.",
             required=True,
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(

src/neon/azext_neon/aaz/latest/neon/postgres/branch/_show.py

@@ -50,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
             id_part="child_name_2",
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.organization_name = AAZStrArg(
@@ -70,7 +70,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
             id_part="child_name_1",
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(

src/neon/azext_neon/aaz/latest/neon/postgres/branch/_update.py

@@ -53,7 +53,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
             id_part="child_name_2",
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.organization_name = AAZStrArg(
@@ -73,7 +73,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
             id_part="child_name_1",
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(
@@ -259,7 +259,7 @@ def _build_schema_on_200(cls):
                 return cls._schema_on_200
 
             cls._schema_on_200 = AAZObjectType()
-            _UpdateHelper._build_schema_branch_read(cls._schema_on_200)
+            _UpdateHelper._build_schema_models_branch_read(cls._schema_on_200)
 
             return cls._schema_on_200
 
@@ -378,7 +378,7 @@ def _build_schema_on_200_201(cls):
                 return cls._schema_on_200_201
 
             cls._schema_on_200_201 = AAZObjectType()
-            _UpdateHelper._build_schema_branch_read(cls._schema_on_200_201)
+            _UpdateHelper._build_schema_models_branch_read(cls._schema_on_200_201)
 
             return cls._schema_on_200_201
 
@@ -423,37 +423,59 @@ def _build_schema_models_attributes_update(cls, _builder):
         _builder.set_prop("name", AAZStrType, ".name", typ_kwargs={"flags": {"required": True}})
         _builder.set_prop("value", AAZStrType, ".value", typ_kwargs={"flags": {"required": True}})
 
-    _schema_branch_read = None
+    _schema_models_attributes_read = None
+
+    @classmethod
+    def _build_schema_models_attributes_read(cls, _schema):
+        if cls._schema_models_attributes_read is not None:
+            _schema.name = cls._schema_models_attributes_read.name
+            _schema.value = cls._schema_models_attributes_read.value
+            return
+
+        cls._schema_models_attributes_read = _schema_models_attributes_read = AAZObjectType()
+
+        models_attributes_read = _schema_models_attributes_read
+        models_attributes_read.name = AAZStrType(
+            flags={"required": True},
+        )
+        models_attributes_read.value = AAZStrType(
+            flags={"required": True},
+        )
+
+        _schema.name = cls._schema_models_attributes_read.name
+        _schema.value = cls._schema_models_attributes_read.value
+
+    _schema_models_branch_read = None
 
     @classmethod
-    def _build_schema_branch_read(cls, _schema):
-        if cls._schema_branch_read is not None:
-            _schema.id = cls._schema_branch_read.id
-            _schema.name = cls._schema_branch_read.name
-            _schema.properties = cls._schema_branch_read.properties
-            _schema.system_data = cls._schema_branch_read.system_data
-            _schema.type = cls._schema_branch_read.type
+    def _build_schema_models_branch_read(cls, _schema):
+        if cls._schema_models_branch_read is not None:
+            _schema.id = cls._schema_models_branch_read.id
+            _schema.name = cls._schema_models_branch_read.name
+            _schema.properties = cls._schema_models_branch_read.properties
+            _schema.system_data = cls._schema_models_branch_read.system_data
+            _schema.type = cls._schema_models_branch_read.type
             return
 
-        cls._schema_branch_read = _schema_branch_read = AAZObjectType()
+        cls._schema_models_branch_read = _schema_models_branch_read = AAZObjectType()
 
-        branch_read = _schema_branch_read
-        branch_read.id = AAZStrType(
+        models_branch_read = _schema_models_branch_read
+        models_branch_read.id = AAZStrType(
             flags={"read_only": True},
         )
-        branch_read.name = AAZStrType(
+        models_branch_read.name = AAZStrType(
             flags={"read_only": True},
         )
-        branch_read.properties = AAZObjectType()
-        branch_read.system_data = AAZObjectType(
+        models_branch_read.properties = AAZObjectType()
+        models_branch_read.system_data = AAZObjectType(
             serialized_name="systemData",
             flags={"read_only": True},
         )
-        branch_read.type = AAZStrType(
+        models_branch_read.type = AAZStrType(
             flags={"read_only": True},
         )
 
-        properties = _schema_branch_read.properties
+        properties = _schema_models_branch_read.properties
         properties.attributes = AAZListType()
         properties.created_at = AAZStrType(
             serialized_name="createdAt",
@@ -486,14 +508,14 @@ def _build_schema_branch_read(cls, _schema):
         )
         properties.roles = AAZListType()
 
-        attributes = _schema_branch_read.properties.attributes
+        attributes = _schema_models_branch_read.properties.attributes
         attributes.Element = AAZObjectType()
         cls._build_schema_models_attributes_read(attributes.Element)
 
-        databases = _schema_branch_read.properties.databases
+        databases = _schema_models_branch_read.properties.databases
         databases.Element = AAZObjectType()
 
-        _element = _schema_branch_read.properties.databases.Element
+        _element = _schema_models_branch_read.properties.databases.Element
         _element.attributes = AAZListType()
         _element.branch_id = AAZStrType(
             serialized_name="branchId",
@@ -517,14 +539,14 @@ def _build_schema_branch_read(cls, _schema):
             flags={"read_only": True},
         )
 
-        attributes = _schema_branch_read.properties.databases.Element.attributes
+        attributes = _schema_models_branch_read.properties.databases.Element.attributes
         attributes.Element = AAZObjectType()
         cls._build_schema_models_attributes_read(attributes.Element)
 
-        endpoints = _schema_branch_read.properties.endpoints
+        endpoints = _schema_models_branch_read.properties.endpoints
         endpoints.Element = AAZObjectType()
 
-        _element = _schema_branch_read.properties.endpoints.Element
+        _element = _schema_models_branch_read.properties.endpoints.Element
         _element.attributes = AAZListType()
         _element.branch_id = AAZStrType(
             serialized_name="branchId",
@@ -551,14 +573,14 @@ def _build_schema_branch_read(cls, _schema):
             flags={"read_only": True},
         )
 
-        attributes = _schema_branch_read.properties.endpoints.Element.attributes
+        attributes = _schema_models_branch_read.properties.endpoints.Element.attributes
         attributes.Element = AAZObjectType()
         cls._build_schema_models_attributes_read(attributes.Element)
 
-        roles = _schema_branch_read.properties.roles
+        roles = _schema_models_branch_read.properties.roles
         roles.Element = AAZObjectType()
 
-        _element = _schema_branch_read.properties.roles.Element
+        _element = _schema_models_branch_read.properties.roles.Element
         _element.attributes = AAZListType()
         _element.branch_id = AAZStrType(
             serialized_name="branchId",
@@ -583,14 +605,14 @@ def _build_schema_branch_read(cls, _schema):
             flags={"read_only": True},
         )
 
-        attributes = _schema_branch_read.properties.roles.Element.attributes
+        attributes = _schema_models_branch_read.properties.roles.Element.attributes
         attributes.Element = AAZObjectType()
         cls._build_schema_models_attributes_read(attributes.Element)
 
-        permissions = _schema_branch_read.properties.roles.Element.permissions
+        permissions = _schema_models_branch_read.properties.roles.Element.permissions
         permissions.Element = AAZStrType()
 
-        system_data = _schema_branch_read.system_data
+        system_data = _schema_models_branch_read.system_data
         system_data.created_at = AAZStrType(
             serialized_name="createdAt",
         )
@@ -610,33 +632,11 @@ def _build_schema_branch_read(cls, _schema):
             serialized_name="lastModifiedByType",
         )
 
-        _schema.id = cls._schema_branch_read.id
-        _schema.name = cls._schema_branch_read.name
-        _schema.properties = cls._schema_branch_read.properties
-        _schema.system_data = cls._schema_branch_read.system_data
-        _schema.type = cls._schema_branch_read.type
-
-    _schema_models_attributes_read = None
-
-    @classmethod
-    def _build_schema_models_attributes_read(cls, _schema):
-        if cls._schema_models_attributes_read is not None:
-            _schema.name = cls._schema_models_attributes_read.name
-            _schema.value = cls._schema_models_attributes_read.value
-            return
-
-        cls._schema_models_attributes_read = _schema_models_attributes_read = AAZObjectType()
-
-        models_attributes_read = _schema_models_attributes_read
-        models_attributes_read.name = AAZStrType(
-            flags={"required": True},
-        )
-        models_attributes_read.value = AAZStrType(
-            flags={"required": True},
-        )
-
-        _schema.name = cls._schema_models_attributes_read.name
-        _schema.value = cls._schema_models_attributes_read.value
+        _schema.id = cls._schema_models_branch_read.id
+        _schema.name = cls._schema_models_branch_read.name
+        _schema.properties = cls._schema_models_branch_read.properties
+        _schema.system_data = cls._schema_models_branch_read.system_data
+        _schema.type = cls._schema_models_branch_read.type
 
 
 __all__ = ["Update"]

src/neon/azext_neon/aaz/latest/neon/postgres/branch/_wait.py

@@ -46,7 +46,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
             id_part="child_name_2",
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.organization_name = AAZStrArg(
@@ -66,7 +66,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             required=True,
             id_part="child_name_1",
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(

src/neon/azext_neon/aaz/latest/neon/postgres/neon_database/_list.py

@@ -50,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             help="The id of the Neon Branch resource",
             required=True,
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.organization_name = AAZStrArg(
@@ -68,7 +68,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             help="The id of the Neon Project resource.",
             required=True,
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(
@@ -109,7 +109,7 @@ def __call__(self, *args, **kwargs):
         @property
         def url(self):
             return self.client.format_url(
-                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Neon.Postgres/organizations/{organizationName}/projects/{projectName}/branches/{branchName}/neonDatabases",
+                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Neon.Postgres/organizations/{organizationName}/projects/{projectName}/branches/{branchName}/neondatabases",
                 **self.url_parameters
             )
 

src/neon/azext_neon/aaz/latest/neon/postgres/neon_role/_list.py

@@ -50,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             help="The id of the Neon Branch resource",
             required=True,
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.organization_name = AAZStrArg(
@@ -68,7 +68,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             help="The id of the Neon Project resource.",
             required=True,
             fmt=AAZStrArgFormat(
-                pattern="^[a-zA-Z0-9-]{3,24}$",
+                pattern="^\\S.{0,62}\\S$|^\\S$",
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(
@@ -109,7 +109,7 @@ def __call__(self, *args, **kwargs):
         @property
         def url(self):
             return self.client.format_url(
-                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Neon.Postgres/organizations/{organizationName}/projects/{projectName}/branches/{branchName}/neonRoles",
+                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Neon.Postgres/organizations/{organizationName}/projects/{projectName}/branches/{branchName}/neonroles",
                 **self.url_parameters
             )
 

src/neon/azext_neon/aaz/latest/neon/postgres/organization/_create.py

@@ -13,13 +13,13 @@
 
 @register_command(
     "neon postgres organization create",
-    is_preview=True,
 )
 class Create(AAZCommand):
     """Create a Neon Postgres organization
 
     :example: Create Neon Postgres Organization
         az az neon postgres organization create --resource-group sralluri_rg --name Org-cli-test --location "Central US EUAP" --subscription 68a546de-5736-48e8-a69a-5cc636794112 --marketplace-details "{subscription-id:329b25d9-168d-48d5-de4b-28b2324db159,subscription-status:Pending-fullfilment,offer-details:{publisher-id:neon1722366567200,offer-id:neon_serverless_postgres_azure_prod,plan-id:neon_serverless_postgres_azure_prod_free,plan-name:'Free Plan',term-unit:P1M,term-id:gmz7xq9ge3py}}" --user-details "{first-name:User,last-name:Conotoso,email-address:contoso@outlook.com,upn:contoso@outlook.com,phone-number:''}" --company-details "{company-name:'',country:'',business-phone:''}" --partner-organization-properties "{organization-name:Org-cli-test}" --project-properties "{region:'Central US EUAP',pgVersion:17,branch:{branch-name:main,database-name:neondb,role-name:owner_role},project-name:Org-cli-test-project}"
+        az neon postgres create --resource-group sralluri_rg --name Org-cli-test --location "Central US EUAP" --subscription 68a546de-5736-48e8-a69a-5cc636794112 --marketplace-details "{subscription-id:329b25d9-168d-48d5-de4b-28b2324db159,subscription-status:Pending-fullfilment,offer-details:{publisher-id:neon1722366567200,offer-id:neon_serverless_postgres_azure_prod,plan-id:neon_serverless_postgres_azure_prod_free,plan-name:'Free Plan',term-unit:P1M,term-id:gmz7xq9ge3py}}" --user-details "{first-name:User,last-name:Conotoso,email-address:contoso@outlook.com,upn:contoso@outlook.com,phone-number:''}" --company-details "{company-name:'',country:'',business-phone:''}" --partner-organization-properties "{organization-name:Org-cli-test}" --project-properties "{region:'Central US EUAP',pgVersion:17,branch:{branch-name:main,database-name:neondb,role-name:owner_role},project-name:Org-cli-test-project}"
     """
 
     _aaz_info = {