Move Enterprise ID from org request to computed attribute

Author: emerkle826

docs/resources/enterprise_org.md

@@ -29,12 +29,12 @@ resource "astra_enterprise_org" "entorg" {
 
 - `admin_user_id` (String) UUID of the Astra user that will be the admin of the organization
 - `email` (String) Organization email address
-- `enterprise_id` (String) UUID of the Enterprise under which the organization should be created
 - `name` (String) Organization name
 
 ### Read-Only
 
 - `created_at` (String) The timestamp when the organization was created.
+- `enterprise_id` (String) UUID of the Enterprise under which the organization is created
 - `id` (String) The ID of this resource.
 - `last_modified` (String) The timestamp when the organization was last modified.
 - `organization_group_id` (String) The group ID (UUID) of the organization.

go.mod

@@ -5,7 +5,7 @@ go 1.21
 toolchain go1.22.0
 
 require (
-	github.com/datastax/astra-client-go/v2 v2.2.56
+	github.com/datastax/astra-client-go/v2 v2.2.57
 	github.com/datastax/pulsar-admin-client-go v0.0.0-20230707040954-1a4745e07587
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320

go.sum

@@ -101,8 +101,8 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
-github.com/datastax/astra-client-go/v2 v2.2.56 h1:pB93zYVWDTobjpqRnER0R3LdhAhoPdSKTeYc7/2X2Uw=
-github.com/datastax/astra-client-go/v2 v2.2.56/go.mod h1:zxXWuqDkYia7PzFIL3T7RmjChc9LN81UnfI2yB4kE7M=
+github.com/datastax/astra-client-go/v2 v2.2.57 h1:B2AvCRqWOVBs536r42TpWht1Jt1k2OLsBABLAfN0iVw=
+github.com/datastax/astra-client-go/v2 v2.2.57/go.mod h1:zxXWuqDkYia7PzFIL3T7RmjChc9LN81UnfI2yB4kE7M=
 github.com/datastax/pulsar-admin-client-go v0.0.0-20230707040954-1a4745e07587 h1:3jv+O0hWcz3oj3sZ9/Ov9/m1Vaqx8Ql8jp5ZeA13O5A=
 github.com/datastax/pulsar-admin-client-go v0.0.0-20230707040954-1a4745e07587/go.mod h1:guL8YZ5gJINN+h5Kmja1AnuzhxLU3sHQL8o/8HYLtqk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

internal/provider/resource_enterprise_org.go

@@ -40,37 +40,36 @@ func resourceEnterpriseOrg() *schema.Resource {
 				Required:    true,
 				ForceNew:    true,
 			},
+			// Computed
 			"enterprise_id": {
-				Description: "UUID of the Enterprise under which the organization should be created",
+				Description: "UUID of the Enterprise under which the organization is created",
 				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
+				Computed:    true,
 			},
-			// Computed
 			"organization_id": {
-				Description:    "The Astra organization ID (UUID) for the created Enterprise organization.",
-				Type:           schema.TypeString,
-				Computed:       true,
+				Description: "The Astra organization ID (UUID) for the created Enterprise organization.",
+				Type:        schema.TypeString,
+				Computed:    true,
 			},
 			"organization_type": {
-				Description:    "The type of the organization.",
-				Type:           schema.TypeString,
-				Computed:       true,
+				Description: "The type of the organization.",
+				Type:        schema.TypeString,
+				Computed:    true,
 			},
 			"organization_group_id": {
-				Description:    "The group ID (UUID) of the organization.",
-				Type:           schema.TypeString,
-				Computed:       true,
+				Description: "The group ID (UUID) of the organization.",
+				Type:        schema.TypeString,
+				Computed:    true,
 			},
 			"created_at": {
-				Description:    "The timestamp when the organization was created.",
-				Type:           schema.TypeString,
-				Computed:       true,
+				Description: "The timestamp when the organization was created.",
+				Type:        schema.TypeString,
+				Computed:    true,
 			},
 			"last_modified": {
-				Description:    "The timestamp when the organization was last modified.",
-				Type:           schema.TypeString,
-				Computed:       true,
+				Description: "The timestamp when the organization was last modified.",
+				Type:        schema.TypeString,
+				Computed:    true,
 			},
 			// TODO: Add MarketPlaceData
 		},
@@ -83,13 +82,11 @@ func resourceEnterpriseOrgCreate(ctx context.Context, d *schema.ResourceData, me
 	orgName := d.Get("name").(string)
 	orgEmail := d.Get("email").(string)
 	adminUid := d.Get("admin_user_id").(string)
-	enterpriseId := d.Get("enterprise_id").(string)
 
 	orgReq := astra.CreateOrganizationInEnterpriseJSONRequestBody{
 		Name:         orgName,
 		Email:        orgEmail,
 		AdminUserID:  adminUid,
-		EnterpriseID: enterpriseId,
 	}
 
 	resp, err := client.CreateOrganizationInEnterpriseWithResponse(ctx, orgReq)
@@ -132,7 +129,7 @@ func setEnterpriseOrgData(d *schema.ResourceData, org *astra.CreateOrgInEnterpri
 	if org == nil {
 		return errors.New("organization is nil")
 	}
-
+	d.Set("enterprise_id", *org.EnterpriseId)
 	d.Set("organization_id", *org.OrganizationID)
 	d.Set("organization_type", *org.OrgType)
 	d.Set("organization_group_id", *org.OrganizationGroupId)