Add dependency between prepare and acknowledge resources

This dependency is required as it will force execution of
acknowledgement after the preparation is complete.

Signed-off-by: Kobi Samoray <[email protected]>

Author: ksamoray

nsxt/resource_nsxt_upgrade_precheck_acknowledge.go

@@ -51,6 +51,12 @@ func resourceNsxtUpgradePrecheckAcknowledge() *schema.Resource {
 				},
 				Computed: true,
 			},
+			"target_version": {
+				Type:        schema.TypeString,
+				Description: "Target system version",
+				Required:    true,
+				ForceNew:    true,
+			},
 		},
 	}
 }

nsxt/resource_nsxt_upgrade_prepare.go

@@ -117,6 +117,11 @@ func resourceNsxtUpgradePrepare() *schema.Resource {
 				},
 				Computed: true,
 			},
+			"target_version": {
+				Type:        schema.TypeString,
+				Description: "Target system version",
+				Computed:    true,
+			},
 		},
 	}
 }
@@ -153,32 +158,37 @@ func prepareForUpgrade(d *schema.ResourceData, m interface{}) error {
 	return nil
 }
 
-func precheckNeeded(m interface{}) (bool, error) {
+func getSummaryInfo(m interface{}) (string, bool, error) {
 	connector := getPolicyConnector(m)
 	summaryClient := upgrade.NewSummaryClient(connector)
 	summary, err := summaryClient.Get()
 	if err != nil {
-		return false, err
+		return "", false, err
+	}
+	var targetVersion string
+	if summary.TargetVersion != nil {
+		targetVersion = *summary.TargetVersion
 	}
 	if summary.UpgradeCoordinatorUpdated == nil || !(*summary.UpgradeCoordinatorUpdated) {
 		log.Printf("Upgrade coordinated is not upgraded, skip running precheck")
-		return false, nil
+		return targetVersion, false, nil
 	}
 	if summary.UpgradeStatus == nil || (*summary.UpgradeStatus) != nsxModel.UpgradeSummary_UPGRADE_STATUS_NOT_STARTED {
 		log.Printf("Upgrade process has started, skip running precheck")
-		return false, nil
+		return targetVersion, false, nil
 	}
-	return true, nil
+	return targetVersion, true, nil
 }
 
 func resourceNsxtUpgradePrepareRead(d *schema.ResourceData, m interface{}) error {
 	id := d.Id()
 	var err error
 	// Execute precheck in Read function if upload bundle has been uploaded and upgrade not started
-	precheckNeeded, err := precheckNeeded(m)
+	targetVersion, precheckNeeded, err := getSummaryInfo(m)
 	if err != nil {
 		return logAPIError("Failed to get previous precheck result", err)
 	}
+	d.Set("target_version", targetVersion)
 	if precheckNeeded {
 		previousAcknowledgedPrecheckIDs, err := getAcknowledgedPrecheckIDs(m)
 		if err != nil {
@@ -363,9 +373,9 @@ func getPrecheckErrors(m interface{}, typeParam *string) ([]nsxModel.UpgradeChec
 	return resultList.Results, nil
 }
 
-func setFailedPrechecksInSchema(d *schema.ResourceData, precheckErros []nsxModel.UpgradeCheckFailure) error {
+func setFailedPrechecksInSchema(d *schema.ResourceData, precheckErrors []nsxModel.UpgradeCheckFailure) error {
 	var failedPrechecksList []map[string]interface{}
-	for _, precheckError := range precheckErros {
+	for _, precheckError := range precheckErrors {
 		elem := make(map[string]interface{})
 		elem["id"] = precheckError.Id
 		elem["message"] = precheckError.Message.Message

website/docs/r/upgrade_precheck_acknowledge.html.markdown

@@ -14,7 +14,8 @@ for NSXT upgrade.
 
 ```hcl
 resource "nsxt_upgrade_precheck_acknowledge" "test" {
-  precheck_ids = ["backupOperationCheck", "pUBCheck"]
+  precheck_ids   = ["backupOperationCheck", "pUBCheck"]
+  target_version = nsxt_upgrade_prepare.test.target_version
 }
 ```
 
@@ -23,6 +24,10 @@ resource "nsxt_upgrade_precheck_acknowledge" "test" {
 The following arguments are supported:
 
 * `precheck_ids` - (Required) List of ids of failed prechecks user wants to acknowledge.
+* `target_version` - (Required) Target system version
+
+## Attributes Reference
+
 * `precheck_warnings` - (Computed) State of all precheck warnings.
   * `id` - ID of the precheck warning.
   * `message` - Message of the precheck warning.

website/docs/r/upgrade_prepare.html.markdown

@@ -42,7 +42,7 @@ The following arguments are supported:
 * `uc_upgrade_timeout` - (Optional) Timeout for upgrading upgrade coordinator in seconds. Default is `1800`.
 * `precheck_timeout` - (Optional) Timeout for executing pre-upgrade checks in seconds. Default is `3600`.
 
-## Argument Reference
+## Attributes Reference
 
 In addition to arguments listed above, the following attributes are exported:
 
@@ -54,6 +54,7 @@ In addition to arguments listed above, the following attributes are exported:
   * `needs_resolve` - Boolean value identifies if resolution is required for the precheck.
   * `acked` - Boolean value which identifies if precheck has been acknowledged.
   * `resolution_status` - The resolution status of precheck failure.
+* `target_version` - Target system version
 
 ## Importing