Enable kaleido_configuration Changes Triggering Updates for kaleido_n…

…ode and kaleido_service (#35) * Updating Configurations w/ details_json Signed-off-by: hfuss <[email protected]> * make target for m1 mac Signed-off-by: hfuss <[email protected]> * fix for dev docs Signed-off-by: hfuss <[email protected]> * updating dev docs to prevent future mistakes Signed-off-by: hfuss <[email protected]> * Adding update_trigger field for kaleido_node; fixing unit tests Signed-off-by: hfuss <[email protected]> * fix update_trigger Signed-off-by: hfuss <[email protected]> * adding last_updated to configuration; update_trigger for services Signed-off-by: hfuss <[email protected]> * ensuring last_updated reports as computed after apply to provide consistent plans Signed-off-by: hfuss <[email protected]>
kaleido-io · May 4, 2022 · f31401c · f31401c
1 parent 6e176f6
commit f31401c
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,7 @@ vendor
 .LSOverride
 
 terraform-provider-kaleido*
-coverage.txt
+coverage.txt
+
+# Folder for defining Terraform scripts to manually test the provider
+test/
diff --git a/Makefile b/Makefile
@@ -13,6 +13,8 @@ LDFLAGS="-X main.buildDate=`date -u +\"%Y-%m-%dT%H:%M:%SZ\"` -X main.buildVersio
 DEPS=https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2
 TARGETS="windows-10.0/*,darwin-10.10/*"
 
+.PHONY: test
+
 all: deps build test
 build:
 	$(GOBUILD) -o ${BINARY_NAME}
@@ -28,6 +30,8 @@ deps:
 build-linux:
 		GOOS=linux GOARCH=amd64 $(GOBUILD) -o $(BINARY_LIN) -v
 build-mac:
+		GOOS=darwin GOARCH=arm64 $(GOBUILD) -o $(BINARY_MAC) -v
+build-mac-legacy:
 		GOOS=darwin GOARCH=amd64 $(GOBUILD) -o $(BINARY_MAC) -v
 build-win:
 		GOOS=windows GOARCH=amd64 $(GOBUILD) -o $(BINARY_WIN) -v
diff --git a/README.md b/README.md
@@ -10,15 +10,23 @@ make
 
 To install the provider from a local build with Terraform 0.14, configure your `~/.terraformrc` with:
 
-```
+```hcl
 provider_installation {
   dev_overrides {
-    "registry.terraform.io/kaleido/kaleido" = "/path/to/terraform-provider-kaleido"
+    "registry.terraform.io/kaleido-io/kaleido" = "/path/to/terraform-provider-kaleido"
   }
   direct {}
 }
 ```
 
+then be sure to build the binary you are testing using:
+
+```shell
+make build
+```
+
+> NOTE: binaries built via `make build-${OS}` will not be detected by Terraform's `dev_overrides`.
+
 ## Examples
 
 End to end example in [examples/multi_region_with_b2b](examples/multi_region_with_b2b)

diff --git a/kaleido/resource_configuration.go b/kaleido/resource_configuration.go
@@ -16,6 +16,7 @@ package kaleido
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/customdiff"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -61,7 +62,18 @@ func resourceConfiguration() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"last_updated": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 		},
+		CustomizeDiff: customdiff.All(
+			customdiff.ComputedIf("last_updated", func(d *schema.ResourceDiff, meta interface{}) bool {
+				return d.HasChange("name") || d.HasChange("details") || d.HasChange("details_json") ||
+					d.HasChange("type") || d.HasChange("membership_id") ||
+					d.HasChange("environment_id") || d.HasChange("consortium_id")
+			}),
+		),
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(10 * time.Minute),
 			Update: schema.DefaultTimeout(10 * time.Minute),
@@ -111,6 +123,7 @@ func resourceConfigurationCreate(d *schema.ResourceData, meta interface{}) error
 	}
 
 	d.SetId(configuration.ID)
+	d.Set("last_updated", time.Now().UnixNano())
 
 	return nil
 }
@@ -119,7 +132,15 @@ func resourceConfigurationUpdate(d *schema.ResourceData, meta interface{}) error
 	client := meta.(kaleido.KaleidoClient)
 	consortiumID := d.Get("consortium_id").(string)
 	environmentID := d.Get("environment_id").(string)
-	details := duplicateDetails(d.Get("details").(map[string]interface{}))
+	detailsMap := d.Get("details").(map[string]interface{})
+	detailsJSON := d.Get("details_json").(string)
+	if detailsJSON != "" {
+		if err := json.Unmarshal([]byte(detailsJSON), &detailsMap); err != nil {
+			msg := "Could not parse details_json of %s %s in consortium %s in environment %s: %s"
+			return fmt.Errorf(msg, d.Get("type"), d.Get("name"), consortiumID, environmentID, err)
+		}
+	}
+	details := duplicateDetails(detailsMap)
 	configuration := kaleido.NewConfiguration(d.Get("name").(string), "", "", details)
 	configID := d.Id()
 
@@ -135,6 +156,8 @@ func resourceConfigurationUpdate(d *schema.ResourceData, meta interface{}) error
 		return fmt.Errorf(msg, configID, consortiumID, environmentID, status, res.String())
 	}
 
+	d.Set("last_updated", time.Now().UnixNano())
+
 	return nil
 }
 
@@ -164,6 +187,19 @@ func resourceConfigurationRead(d *schema.ResourceData, meta interface{}) error {
 
 	d.Set("name", configuration.Name)
 	d.Set("type", configuration.Type)
+	d.Set("details", configuration.Details)
+
+	// if details_json is set, we need it to reflect the state for diffing
+	detailsJSON := d.Get("details_json").(string)
+	if detailsJSON != "" {
+		detailsJSON, err := json.Marshal(configuration.Details)
+		if err != nil {
+			msg := "Could not parse configuration details to JSON for config %s in consortium %s in environment %s with status %d: %s"
+			return fmt.Errorf(msg, configurationID, consortiumID, environmentID, status, res.String())
+		}
+		d.Set("details_json", string(detailsJSON))
+	}
+
 	return nil
 }
 

diff --git a/kaleido/resource_node.go b/kaleido/resource_node.go
@@ -112,6 +112,10 @@ func resourceNode() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
+			"update_trigger": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 		},
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(10 * time.Minute),

diff --git a/kaleido/resource_service.go b/kaleido/resource_service.go
@@ -93,6 +93,10 @@ func resourceService() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
+			"update_trigger": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 		},
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(10 * time.Minute),