Adding termid parameter for conflent org creation (#9091)

DeepikaNMS · web-flow · commit 7c0b4d473411 · 2025-09-01T17:37:57.000+08:00
* Adding termid parameter

* Updates to change log version

* Added help for term_id parameter

* Added Live tests recording and updated the api version

* Moved the term id to constants file

* Remove blank line for fixing azdev style issue

* Fix azdev style issue

* added 2 blank lines as per the azdev style

* Fix assertion error by changing email to test@example.com
diff --git a/src/confluent/HISTORY.rst b/src/confluent/HISTORY.rst
@@ -2,6 +2,10 @@
 
 Release History
 ===============
+1.1.0
++++++
+* Updated az confluent organization create command to accept term_id as an optional parameter.
+
 1.0.0
 +++++
 * Updated CLI command descriptions to be more user and support az mcp commands.
diff --git a/src/confluent/azext_confluent/constants.py b/src/confluent/azext_confluent/constants.py
@@ -0,0 +1,8 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+# Confluent constants
+
+DEFAULT_TERM_ID = "gmz7xq9ge3py"  # Replace with the actual default value if known
diff --git a/src/confluent/azext_confluent/manual/_params.py b/src/confluent/azext_confluent/manual/_params.py
@@ -17,6 +17,7 @@ def load_arguments(self, _):
         c.argument('plan_id', type=str, help='Offer Plan Id', arg_group='Offer Detail')
         c.argument('plan_name', type=str, help='Offer Plan Name', arg_group='Offer Detail')
         c.argument('term_unit', type=str, help='Offer Plan Term unit', arg_group='Offer Detail')
+        c.argument('term_id', type=str, help='Offer Plan Term ID', arg_group='Offer Detail')
 
     with self.argument_context('confluent organization delete') as c:
         c.argument('yes', options_list=['--yes', '-y'], action='store_true', help='Do not prompt for confirmation.')
diff --git a/src/confluent/azext_confluent/manual/custom.py b/src/confluent/azext_confluent/manual/custom.py
@@ -9,6 +9,7 @@
 # --------------------------------------------------------------------------
 
 from azure.cli.core.util import sdk_no_wait, user_confirmation
+from ..constants import DEFAULT_TERM_ID
 
 
 def confluent_organization_create(cmd,
@@ -18,6 +19,7 @@ def confluent_organization_create(cmd,
                                   plan_id,
                                   plan_name,
                                   term_unit,
+                                  term_id=None,
                                   tags=None,
                                   location=None,
                                   publisher_id=None,
@@ -61,7 +63,7 @@ def confluent_organization_create(cmd,
     body['offer_detail']['plan_id'] = plan_id
     body['offer_detail']['plan_name'] = plan_name
     body['offer_detail']['term_unit'] = term_unit
-
+    body['offer_detail']['term_id'] = DEFAULT_TERM_ID if term_id is None else term_id
     return sdk_no_wait(no_wait,
                        client.begin_create,
                        resource_group_name=resource_group_name,
diff --git a/src/confluent/azext_confluent/tests/latest/recordings/test_confluent_Scenario.yaml b/src/confluent/azext_confluent/tests/latest/recordings/test_confluent_Scenario.yaml
diff --git a/src/confluent/azext_confluent/tests/latest/recordings/test_term_accept_basic_flow.yaml b/src/confluent/azext_confluent/tests/latest/recordings/test_term_accept_basic_flow.yaml
diff --git a/src/confluent/azext_confluent/tests/latest/test_confluent_scenario.py b/src/confluent/azext_confluent/tests/latest/test_confluent_scenario.py
@@ -122,18 +122,18 @@ def call_scenario(test, rg):
     step_organization_create(test, rg, checks=[
         test.check("location", "eastus2euap", case_sensitive=False),
         # change to real values for userDetail in live tests
-        test.check("userDetail.emailAddress", "contoso@microsoft.com", case_sensitive=False),
-        test.check("userDetail.firstName", "contoso", case_sensitive=False),
-        test.check("userDetail.lastName", "zhou", case_sensitive=False),
+        test.check("userDetail.emailAddress", "test@example.com", case_sensitive=False),
+        test.check("userDetail.firstName", "Deepika", case_sensitive=False),
+        test.check("userDetail.lastName", "N", case_sensitive=False),
         test.check("tags.environment", "Dev", case_sensitive=False),
         test.check("name", "{myOrganization}", case_sensitive=False),
     ])
     step_organization_show(test, rg, checks=[
         test.check("location", "eastus2euap", case_sensitive=False),
         # change to real values for userDetail in live tests
-        test.check("userDetail.emailAddress", "contoso@microsoft.com", case_sensitive=False),
-        test.check("userDetail.firstName", "contoso", case_sensitive=False),
-        test.check("userDetail.lastName", "zhou", case_sensitive=False),
+        test.check("userDetail.emailAddress", "test@example.com", case_sensitive=False),
+        test.check("userDetail.firstName", "Deepika", case_sensitive=False),
+        test.check("userDetail.lastName", "N", case_sensitive=False),
         test.check("tags.environment", "Dev", case_sensitive=False),
         test.check("name", "{myOrganization}", case_sensitive=False),
     ])
@@ -145,9 +145,9 @@ def call_scenario(test, rg):
     ])
     step_organization_update(test, rg, checks=[
         test.check("location", "eastus2euap", case_sensitive=False),
-        test.check("userDetail.emailAddress", "contoso@microsoft.com", case_sensitive=False),
-        test.check("userDetail.firstName", "contoso", case_sensitive=False),
-        test.check("userDetail.lastName", "zhou", case_sensitive=False),
+        test.check("userDetail.emailAddress", "test@example.com", case_sensitive=False),
+        test.check("userDetail.firstName", "Deepika", case_sensitive=False),
+        test.check("userDetail.lastName", "N", case_sensitive=False),
         test.check("name", "{myOrganization}", case_sensitive=False),
         test.check("tags.client", "dev-client", case_sensitive=False),
     ])
diff --git a/src/confluent/azext_confluent/tests/latest/test_confluent_scenario_coverage.md b/src/confluent/azext_confluent/tests/latest/test_confluent_scenario_coverage.md
@@ -1,8 +1,8 @@
 |Scenario|Result|ErrorMessage|ErrorStack|ErrorNormalized|StartDt|EndDt|
-|step_terms_list|successed||||2025-06-05 05:20:39.201743|2025-06-05 05:20:39.676841|
-|step_organization_show|successed||||2025-06-05 05:20:40.372454|2025-06-05 05:20:40.590599|
-|step_organization_list|successed||||2025-06-05 05:20:40.590599|2025-06-05 05:20:40.827538|
-|step_organization_list2|successed||||2025-06-05 05:20:40.828541|2025-06-05 05:20:41.034481|
-|step_organization_update|successed||||2025-06-05 05:20:41.036496|2025-06-05 05:20:41.235630|
-|step_organization_delete|successed||||2025-06-05 05:20:41.235630|2025-06-05 05:20:41.628799|
+|step_terms_list|successed||||2025-08-28 08:06:16.102233|2025-08-28 08:06:17.474145|
+|step_organization_show|successed||||2025-08-28 08:07:42.460262|2025-08-28 08:07:43.541080|
+|step_organization_list|successed||||2025-08-28 08:07:43.541080|2025-08-28 08:07:44.422305|
+|step_organization_list2|successed||||2025-08-28 08:07:44.423313|2025-08-28 08:07:47.132562|
+|step_organization_update|successed||||2025-08-28 08:07:47.132562|2025-08-28 08:07:52.996682|
+|step_organization_delete|successed||||2025-08-28 08:07:52.997698|2025-08-28 08:08:30.250520|
 Coverage: 6/6
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/_configuration.py b/src/confluent/azext_confluent/vendored_sdks/confluent/_configuration.py
@@ -48,7 +48,7 @@ def __init__(
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2021-03-01-preview"
+        self.api_version = "2024-07-01"
         self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
         kwargs.setdefault('sdk_moniker', 'mgmt-confluent/{}'.format(VERSION))
         self._configure(**kwargs)
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models.py b/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models.py
@@ -181,6 +181,7 @@ class OfferDetail(msrest.serialization.Model):
         'plan_id': {'key': 'planId', 'type': 'str'},
         'plan_name': {'key': 'planName', 'type': 'str'},
         'term_unit': {'key': 'termUnit', 'type': 'str'},
+        'term_id': {'key': 'termId', 'type': 'str'},
         'status': {'key': 'status', 'type': 'str'},
     }
 
@@ -194,6 +195,7 @@ def __init__(
         self.plan_id = kwargs['plan_id']
         self.plan_name = kwargs['plan_name']
         self.term_unit = kwargs['term_unit']
+        self.term_id = kwargs['term_id']
         self.status = kwargs.get('status', None)
 
 
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models_py3.py b/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models_py3.py
@@ -198,6 +198,7 @@ class OfferDetail(msrest.serialization.Model):
         'plan_id': {'key': 'planId', 'type': 'str'},
         'plan_name': {'key': 'planName', 'type': 'str'},
         'term_unit': {'key': 'termUnit', 'type': 'str'},
+        'term_id': {'key': 'termId', 'type': 'str'},
         'status': {'key': 'status', 'type': 'str'},
     }
 
@@ -209,6 +210,7 @@ def __init__(
         plan_id: str,
         plan_name: str,
         term_unit: str,
+        term_id: str,
         status: Optional[Union[str, "SaaSOfferStatus"]] = None,
         **kwargs
     ):
@@ -218,6 +220,7 @@ def __init__(
         self.plan_id = plan_id
         self.plan_name = plan_name
         self.term_unit = term_unit
+        self.term_id = term_id
         self.status = status
 
 
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_marketplace_agreements_operations.py b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_marketplace_agreements_operations.py
@@ -64,7 +64,7 @@ def list(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-03-01-preview"
+        api_version = "2024-07-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations.py b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations.py
@@ -66,7 +66,7 @@ def list_by_subscription(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-03-01-preview"
+        api_version = "2024-07-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -139,7 +139,7 @@ def list_by_resource_group(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-03-01-preview"
+        api_version = "2024-07-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -216,7 +216,7 @@ def get(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-03-01-preview"
+        api_version = "2024-07-01"
         accept = "application/json"
 
         # Construct URL
@@ -266,7 +266,7 @@ def _create_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-03-01-preview"
+        api_version = "2024-07-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -417,7 +417,7 @@ def update(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-03-01-preview"
+        api_version = "2024-07-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -474,7 +474,7 @@ def _delete_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-03-01-preview"
+        api_version = "2024-07-01"
         accept = "application/json"
 
         # Construct URL
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations_operations.py b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations_operations.py
@@ -64,7 +64,7 @@ def list(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-03-01-preview"
+        api_version = "2024-07-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_validations_operations.py b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_validations_operations.py
@@ -72,7 +72,7 @@ def validate_organization(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-03-01-preview"
+        api_version = "2024-07-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
diff --git a/src/confluent/setup.py b/src/confluent/setup.py
@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages
 
 # HISTORY.rst entry.
-VERSION = '1.0.0'
+VERSION = '1.1.0'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
