Merge pull request #180 from rawmind0/log

Updated log_file to sync logs and updated computed fields

Author: rawmind0

CHANGELOG.md

@@ -1,4 +1,18 @@
-## 1.0.0-rc4 (Unreleased)
+## 1.0.0-rc4 (March 13, 2020)
+
+FEATURES:
+
+
+
+ENHANCEMENTS:
+
+* Updated `log_file` to sync logs
+
+
+BUG FIXES:
+
+* Fixed computed fields to avoid inconsistent plan
+
 ## 1.0.0-rc3 (February 28, 2020)
 
 FEATURES:

rke/config.go

@@ -24,6 +24,7 @@ type Config struct {
 	Debug     bool
 	LogBuffer *bytes.Buffer
 	LogFile   string
+	File      *os.File
 }
 
 func (c *Config) initLogger() {
@@ -36,23 +37,25 @@ func (c *Config) initLogger() {
 	}
 
 	var writer io.Writer = c.LogBuffer
-	//writer := io.MultiWriter(os.Stderr, c.LogBuffer)
-
+	if len(c.LogFile) > 0 {
+		if c.File == nil {
+			f, errFile := os.OpenFile(c.LogFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+			if errFile != nil {
+				log.Errorf("Opening logfile %s err:%v", c.LogFile, errFile)
+				return
+			}
+			c.File = f
+		}
+		writer = io.MultiWriter(c.LogBuffer, c.File)
+	}
 	log.SetOutput(writer)
 }
 
 func (c *Config) saveRKEOutput(err error) error {
-	if len(c.LogFile) > 0 {
-		f, errFile := os.OpenFile(c.LogFile, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
-		if errFile != nil {
-			return fmt.Errorf("Opening logfile %s err:%v", c.LogFile, errFile)
-		}
-		defer f.Close()
-		if _, errFile := f.Write(c.LogBuffer.Bytes()); errFile != nil {
-			return fmt.Errorf("Writing logfile %s err:%v", c.LogFile, errFile)
-		}
+	if c.File != nil {
+		defer c.File.Close()
+		defer c.File.Sync()
 	}
-
 	if err != nil {
 		return fmt.Errorf(rkeErrorTemplate, c.LogBuffer.String(), err)
 	}

rke/resource_rke_cluster.go

@@ -27,6 +27,45 @@ func resourceRKECluster() *schema.Resource {
 		Update: resourceRKEClusterUpdate,
 		Delete: resourceRKEClusterDelete,
 		Schema: rkeClusterFields(),
+		CustomizeDiff: func(d *schema.ResourceDiff, i interface{}) error {
+			changed, changedKeys := getChangedKeys(d)
+			if changed > 0 {
+				computedFields := []string{
+					"rke_state",
+					"kube_config_yaml",
+					"rke_cluster_yaml",
+				}
+
+				if changedKeys["rotate_certificates"] {
+					for _, key := range []string{"ca_crt", "client_cert", "client_key", "certificates", "kube_admin_user"} {
+						computedFields = append(computedFields, key)
+					}
+				}
+
+				if changedKeys["dns"] || changedKeys["services"] {
+					for _, key := range []string{"cluster_domain", "cluster_cidr", "cluster_dns_server"} {
+						computedFields = append(computedFields, key)
+					}
+				}
+
+				if changedKeys["nodes"] {
+					for _, key := range []string{"api_server_url", "etcd_hosts", "control_plane_hosts", "inactive_hosts", "worker_hosts"} {
+						computedFields = append(computedFields, key)
+					}
+				}
+
+				if changedKeys["kubernetes_version"] || changedKeys["system_images"] {
+					computedFields = append(computedFields, "running_system_images")
+				}
+
+				for _, key := range computedFields {
+					if err := d.SetNewComputed(key); err != nil {
+						return err
+					}
+				}
+			}
+			return nil
+		},
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(30 * time.Minute),
 			Update: schema.DefaultTimeout(30 * time.Minute),
@@ -48,7 +87,7 @@ func resourceRKEClusterUpdate(d *schema.ResourceData, meta interface{}) error {
 	if err := clusterUp(d); err != nil {
 		return meta.(*Config).saveRKEOutput(err)
 	}
-	return meta.(*Config).saveRKEOutput(resourceRKEClusterRead(d, meta))
+	return resourceRKEClusterRead(d, meta)
 }
 
 func resourceRKEClusterRead(d *schema.ResourceData, meta interface{}) error {
@@ -64,7 +103,7 @@ func resourceRKEClusterDelete(d *schema.ResourceData, meta interface{}) error {
 	log.Info("Deleting RKE cluster...")
 	err := clusterDelete(d)
 	if err != nil {
-		return err
+		return meta.(*Config).saveRKEOutput(err)
 	}
 	d.SetId("")
 	return nil
@@ -332,6 +371,44 @@ func removeTempDir(tempDir string) {
 	}
 }
 
+func getChangedKeys(d *schema.ResourceDiff) (int, map[string]bool) {
+	targetKeys := []string{
+		"addon_job_timeout",
+		"addons",
+		"addons_include",
+		"authentication",
+		"authorization",
+		"bastion_host",
+		"cloud_provider",
+		"cluster_name",
+		"dns",
+		"ignore_docker_version",
+		"ingress",
+		"kubernetes_version",
+		"monitoring",
+		"network",
+		"nodes",
+		"prefix_path",
+		"private_registries",
+		"restore",
+		"rotate_certificates",
+		"services",
+		"ssh_agent_auth",
+		"ssh_cert_path",
+		"ssh_key_path",
+		"system_images",
+	}
+	changedKeys := map[string]bool{}
+	changed := 0
+	for _, key := range targetKeys {
+		changedKeys[key] = d.HasChange(key)
+		if changedKeys[key] {
+			changed++
+		}
+	}
+	return changed, changedKeys
+}
+
 type stateNotFoundError struct {
 	actual error
 }

website/docs/r/cluster.html.markdown

@@ -15,6 +15,11 @@ Provides RKE cluster resource. This can be used to create RKE clusters and retri
 Creating RKE cluster
 
 ```hcl
+# Configure RKE provider
+provider "rke" {
+  debug = true
+  log_file = "rke_debug.log"
+}
 # Create a new RKE cluster
 resource "rke_cluster" "foo" {
   nodes {