diff --git a/go.mod b/go.mod index 22d62632..928400bf 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0 github.com/rclone/rclone v1.57.0 github.com/sebdah/goldie/v2 v2.5.3 + github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.0 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f diff --git a/iterative/resource_task.go b/iterative/resource_task.go index 23e0ad84..3a3c0dee 100644 --- a/iterative/resource_task.go +++ b/iterative/resource_task.go @@ -14,6 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "terraform-provider-iterative/iterative/utils" "terraform-provider-iterative/task" "terraform-provider-iterative/task/common" ) @@ -234,8 +235,13 @@ func resourceTaskRead(ctx context.Context, d *schema.ResourceData, m interface{} return diagnostic(diags, err, diag.Warning) } d.Set("logs", logs) - d.SetId(task.GetIdentifier(ctx).Long()) + + logger := utils.TpiLogger(d) + logger.Info("instance") + logger.Info("logs") + logger.Info("status") + return diags } diff --git a/iterative/utils/logger.go b/iterative/utils/logger.go new file mode 100644 index 00000000..0785a3f6 --- /dev/null +++ b/iterative/utils/logger.go @@ -0,0 +1,105 @@ +package utils + +import ( + "fmt" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/sirupsen/logrus" + "strings" + "time" +) + +var baseTimestamp = time.Now() +var colors = make(map[string]int) + +type basicFormatter struct{} + +func (f *basicFormatter) Format(entry *logrus.Entry) ([]byte, error) { + levelText := strings.ToUpper(entry.Level.String()) + levelColor := colors[levelText] + tpl := "[%s] 🚀\x1b[%dmTPI\x1b[0m %s\n" + return []byte(fmt.Sprintf(tpl, levelText, levelColor, entry.Message)), nil +} + +func init() { + colors["DEBUG"] = 34 + colors["INFO"] = 36 + colors["WARN"] = 33 + colors["ERROR"] = 31 + colors["FATAL"] = 31 + colors["foreground"] = 35 + + logrus.SetLevel(logrus.DebugLevel) + logrus.SetFormatter(&basicFormatter{}) +} + +type tpiFormatter struct{} + +func (f *tpiFormatter) Format(entry *logrus.Entry) ([]byte, error) { + data := make(logrus.Fields) + for k, v := range entry.Data { + data[k] = v + } + + d := data["d"].(*schema.ResourceData) + message := entry.Message + levelText := strings.ToUpper(entry.Level.String()) + levelColor := colors[levelText] + + if message == "instance" { + cloud := d.Get("cloud").(string) + machine := d.Get("machine").(string) + region := d.Get("region").(string) + spot := d.Get("spot").(float64) + + spottext := "" + if spot > 0 { + spottext = fmt.Sprintf("(Spot %f/h)", spot) + } + message = fmt.Sprintf("%s %s%s in %s", cloud, machine, spottext, region) + } + + if message == "status" { + status := d.Get("status").(map[string]interface{}) + terminatedStr := "terminated 🔵" + + running := "queued 🟣" + if status["running"] != nil { + running = terminatedStr + if status["running"].(int) == 1 { + running = "running 🟡" + } + } + + success := "" + if running == terminatedStr { + success = "without any output" + if status["succeeded"] != nil && status["succeeded"].(int) == 1 { + success = "succesfully 🟢" + } + if status["failed"] != nil && status["failed"].(int) == 1 { + success = "with errors 🔴" + } + } + + message = fmt.Sprintf("Task %s %s", running, success) + } + + if message == "logs" { + logs := d.Get("logs").([]interface{}) + taskLogs := "No logs" + if len(logs) > 0 { + taskLogs = strings.Replace(logs[0].(string), "\n", fmt.Sprintf("\n[%s] ", levelText), -1) + } + + message = fmt.Sprintf("Task logs:\x1b[%dm%s\x1b[0m", colors["foreground"], taskLogs) + } + + tpl := "[%s] \x1b[%dm🚀TPI %s\x1b[0m %s'\n" + return []byte(fmt.Sprintf(tpl, levelText, levelColor, d.Id(), message)), nil +} + +func TpiLogger(d *schema.ResourceData) *logrus.Entry { + logrus.SetFormatter(&tpiFormatter{}) + + return logrus.WithFields(logrus.Fields{"d": d}) +} diff --git a/iterative/utils/logger_test.go b/iterative/utils/logger_test.go new file mode 100644 index 00000000..1b8fd862 --- /dev/null +++ b/iterative/utils/logger_test.go @@ -0,0 +1,172 @@ +package utils + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" +) + +func TestState(t *testing.T) { + d := generateSchemaData(t, map[string]interface{}{ + "name": "mytask", + "status": map[string]interface{}{ + "running": 0, + "failed": 0, + }, + }) + + logger := TpiLogger(d) + logger.Info("status") +} + +func TestState2(t *testing.T) { + d := generateSchemaData(t, map[string]interface{}{ + "name": "mytask", + "status": map[string]interface{}{ + "running": 0, + "failed": 1, + }, + }) + + logger := TpiLogger(d) + logger.Info("status") +} + +func TestState3(t *testing.T) { + d := generateSchemaData(t, map[string]interface{}{ + "name": "mytask", + "status": map[string]interface{}{ + "running": 0, + "succeeded": 1, + }, + }) + + logger := TpiLogger(d) + logger.Info("status") +} + +func TestLogs(t *testing.T) { + logs := make([]interface{}, 0) + logs = append(logs, "-- Logs begin at Tue 2022-03-01 12:25:09 UTC, end at Tue 2022-03-01 12:30:30 UTC. --\nMar 01 12:25:50 tpi000000 systemd[1]: Started tpi-task.service.\nMar 01 12:25:50 tpi000000 sudo[1706]: root : TTY=unknown ; PWD=/tmp/tpi-task ; USER=root ; COMMAND=/usr/bin/apt update\nMar 01 12:25:50 tpi000000 sudo[1706]: pam_unix(sudo:session): session opened for user root by (uid=0)\nMar 01 12:25:50 tpi000000 tpi-task[1711]: WARNING: apt does not have a stable CLI interface. Use with caution in scripts.\nMar 01 12:25:50 tpi000000 tpi-task[1711]: Hit:1 http://azure.archive.ubuntu.com/ubuntu focal InRelease\nMar 01 12:25:50 tpi000000 tpi-task[1711]: Get:2 http://azure.archive.ubuntu.com/ubuntu focal-updates InRelease [114 kB]\nMar 01 12:25:50 tpi000000 tpi-task[1711]: Get:3 http://azure.archive.ubuntu.com/ubuntu focal-backports InRelease [108 kB]\nMar 01 12:25:51 tpi000000 tpi-task[1711]: Get:4 http://security.ubuntu.com/ubuntu focal-security InRelease [114 kB]\nMar 01 12:25:51 tpi000000 tpi-task[1711]: Get:5 http://azure.archive.ubuntu.com/ubuntu focal/universe amd64 Packages [8628 kB]\n") + + d := generateSchemaData(t, map[string]interface{}{ + "name": "mytask", + "logs": logs, + }) + + logger := TpiLogger(d) + logger.Info("logs") +} + +func TestMachine(t *testing.T) { + d := generateSchemaData(t, map[string]interface{}{ + "name": "mytask", + "cloud": "aws", + "machine": "t2.micro", + "spot": 0.2, + "region": "us-west", + }) + + logger := TpiLogger(d) + logger.Info("instance") +} + +func generateSchemaData(t *testing.T, raw map[string]interface{}) *schema.ResourceData { + sch := map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + ForceNew: true, + Optional: true, + }, + "cloud": { + Type: schema.TypeString, + ForceNew: true, + Required: true, + }, + "region": { + Type: schema.TypeString, + ForceNew: true, + Optional: true, + Default: "us-west", + }, + "machine": { + Type: schema.TypeString, + ForceNew: true, + Optional: true, + Default: "m", + }, + "disk_size": { + Type: schema.TypeInt, + ForceNew: true, + Optional: true, + Default: 30, + }, + "spot": { + Type: schema.TypeFloat, + ForceNew: true, + Optional: true, + Default: -1, + }, + "image": { + Type: schema.TypeString, + ForceNew: true, + Optional: true, + Default: "ubuntu", + }, + "addresses": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "status": { + Type: schema.TypeMap, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeInt, + }, + }, + "events": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "logs": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "script": { + Type: schema.TypeString, + ForceNew: true, + Required: true, + }, + "workdir": { + Optional: true, + Type: schema.TypeSet, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "input": { + Type: schema.TypeString, + ForceNew: true, + Optional: true, + Default: "", + }, + "output": { + Type: schema.TypeString, + ForceNew: false, + Optional: true, + Default: "", + }, + }, + }, + }, + } + + return schema.TestResourceDataRaw(t, sch, raw) +} diff --git a/task/aws/task.go b/task/aws/task.go index 625f99ec..defaf304 100644 --- a/task/aws/task.go +++ b/task/aws/task.go @@ -2,9 +2,10 @@ package aws import ( "context" - "log" "net" + "github.com/sirupsen/logrus" + "terraform-provider-iterative/task/aws/client" "terraform-provider-iterative/task/aws/resources" "terraform-provider-iterative/task/common" @@ -92,53 +93,53 @@ type Task struct { } func (t *Task) Create(ctx context.Context) error { - log.Println("[INFO] Creating DefaultVPC...") + logrus.Debug("Creating DefaultVPC...") if err := t.DataSources.DefaultVPC.Read(ctx); err != nil { return err } - log.Println("[INFO] Creating DefaultVPCSubnet...") + logrus.Debug("Creating DefaultVPCSubnet...") if err := t.DataSources.DefaultVPCSubnet.Read(ctx); err != nil { return err } - log.Println("[INFO] Creating Image...") + logrus.Debug("Creating Image...") if err := t.DataSources.Image.Read(ctx); err != nil { return err } - log.Println("[INFO] Creating Bucket...") + logrus.Debug("Creating Bucket...") if err := t.Resources.Bucket.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating SecurityGroup...") + logrus.Debug("Creating SecurityGroup...") if err := t.Resources.SecurityGroup.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating KeyPair...") + logrus.Debug("Creating KeyPair...") if err := t.Resources.KeyPair.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating Credentials...") + logrus.Debug("Creating Credentials...") if err := t.DataSources.Credentials.Read(ctx); err != nil { return err } - log.Println("[INFO] Creating LaunchTemplate...") + logrus.Debug("Creating LaunchTemplate...") if err := t.Resources.LaunchTemplate.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating AutoScalingGroup...") + logrus.Debug("Creating AutoScalingGroup...") if err := t.Resources.AutoScalingGroup.Create(ctx); err != nil { return err } - log.Println("[INFO] Uploading Directory...") + logrus.Debug("Uploading Directory...") if t.Attributes.Environment.Directory != "" { if err := t.Push(ctx, t.Attributes.Environment.Directory); err != nil { return err } } - log.Println("[INFO] Starting task...") + logrus.Debug("Starting task...") if err := t.Start(ctx); err != nil { return err } - log.Println("[INFO] Done!") + logrus.Debug("Done!") t.Attributes.Addresses = t.Resources.AutoScalingGroup.Attributes.Addresses t.Attributes.Status = t.Resources.AutoScalingGroup.Attributes.Status t.Attributes.Events = t.Resources.AutoScalingGroup.Attributes.Events @@ -146,47 +147,47 @@ func (t *Task) Create(ctx context.Context) error { } func (t *Task) Read(ctx context.Context) error { - log.Println("[INFO] Reading DefaultVPC...") + logrus.Debug("Reading DefaultVPC...") if err := t.DataSources.DefaultVPC.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading DefaultVPCSubnet...") + logrus.Debug("Reading DefaultVPCSubnet...") if err := t.DataSources.DefaultVPCSubnet.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading Image...") + logrus.Debug("Reading Image...") if err := t.DataSources.Image.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading Bucket...") + logrus.Debug("Reading Bucket...") if err := t.Resources.Bucket.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading Credentials...") + logrus.Debug("Reading Credentials...") if err := t.DataSources.Credentials.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading SecurityGroup...") + logrus.Debug("Reading SecurityGroup...") if err := t.Resources.SecurityGroup.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading KeyPair...") + logrus.Debug("Reading KeyPair...") if err := t.Resources.KeyPair.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading Credentials...") + logrus.Debug("Reading Credentials...") if err := t.DataSources.Credentials.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading LaunchTemplate...") + logrus.Debug("Reading LaunchTemplate...") if err := t.Resources.LaunchTemplate.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading AutoScalingGroup...") + logrus.Debug("Reading AutoScalingGroup...") if err := t.Resources.AutoScalingGroup.Read(ctx); err != nil { return err } - log.Println("[INFO] Done!") + logrus.Debug("Done!") t.Attributes.Addresses = t.Resources.AutoScalingGroup.Attributes.Addresses t.Attributes.Status = t.Resources.AutoScalingGroup.Attributes.Status t.Attributes.Events = t.Resources.AutoScalingGroup.Attributes.Events @@ -194,37 +195,37 @@ func (t *Task) Read(ctx context.Context) error { } func (t *Task) Delete(ctx context.Context) error { - log.Println("[INFO] Downloading Directory...") + logrus.Debug("Downloading Directory...") if t.Attributes.Environment.DirectoryOut != "" && t.Read(ctx) == nil { if err := t.Pull(ctx, t.Attributes.Environment.DirectoryOut); err != nil && err != common.NotFoundError { return err } } - log.Println("[INFO] Deleting AutoScalingGroup...") + logrus.Debug("Deleting AutoScalingGroup...") if err := t.Resources.AutoScalingGroup.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting LaunchTemplate...") + logrus.Debug("Deleting LaunchTemplate...") if err := t.Resources.LaunchTemplate.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting KeyPair...") + logrus.Debug("Deleting KeyPair...") if err := t.Resources.KeyPair.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting SecurityGroup...") + logrus.Debug("Deleting SecurityGroup...") if err := t.Resources.SecurityGroup.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting Credentials...") + logrus.Debug("Deleting Credentials...") if err := t.DataSources.Credentials.Read(ctx); err != nil { return err } - log.Println("[INFO] Deleting Bucket...") + logrus.Debug("Deleting Bucket...") if err := t.Resources.Bucket.Delete(ctx); err != nil { return err } - log.Println("[INFO] Done!") + logrus.Debug("Done!") return nil } diff --git a/task/az/task.go b/task/az/task.go index d062d86b..9dc5d594 100644 --- a/task/az/task.go +++ b/task/az/task.go @@ -2,9 +2,10 @@ package az import ( "context" - "log" "net" + "github.com/sirupsen/logrus" + "terraform-provider-iterative/task/az/client" "terraform-provider-iterative/task/az/resources" "terraform-provider-iterative/task/common" @@ -93,49 +94,49 @@ type Task struct { } func (t *Task) Create(ctx context.Context) error { - log.Println("[INFO] Creating ResourceGroup...") + logrus.Debug("Creating ResourceGroup...") if err := t.Resources.ResourceGroup.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating StorageAccount...") + logrus.Debug("Creating StorageAccount...") if err := t.Resources.StorageAccount.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating BlobContainer...") + logrus.Debug("Creating BlobContainer...") if err := t.Resources.BlobContainer.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating Credentials...") + logrus.Debug("Creating Credentials...") if err := t.DataSources.Credentials.Read(ctx); err != nil { return err } - log.Println("[INFO] Creating VirtualNetwork...") + logrus.Debug("Creating VirtualNetwork...") if err := t.Resources.VirtualNetwork.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating SecurityGroup...") + logrus.Debug("Creating SecurityGroup...") if err := t.Resources.SecurityGroup.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating Subnet...") + logrus.Debug("Creating Subnet...") if err := t.Resources.Subnet.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating VirtualMachineScaleSet...") + logrus.Debug("Creating VirtualMachineScaleSet...") if err := t.Resources.VirtualMachineScaleSet.Create(ctx); err != nil { return err } - log.Println("[INFO] Uploading Directory...") + logrus.Debug("Uploading Directory...") if t.Attributes.Environment.Directory != "" { if err := t.Push(ctx, t.Attributes.Environment.Directory); err != nil { return err } } - log.Println("[INFO] Starting task...") + logrus.Debug("Starting task...") if err := t.Start(ctx); err != nil { return err } - log.Println("[INFO] Done!") + logrus.Debug("Done!") t.Attributes.Addresses = t.Resources.VirtualMachineScaleSet.Attributes.Addresses t.Attributes.Status = t.Resources.VirtualMachineScaleSet.Attributes.Status t.Attributes.Events = t.Resources.VirtualMachineScaleSet.Attributes.Events @@ -143,39 +144,39 @@ func (t *Task) Create(ctx context.Context) error { } func (t *Task) Read(ctx context.Context) error { - log.Println("[INFO] Reading ResourceGroup...") + logrus.Debug("Reading ResourceGroup...") if err := t.Resources.ResourceGroup.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading StorageAccount...") + logrus.Debug("Reading StorageAccount...") if err := t.Resources.StorageAccount.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading BlobContainer...") + logrus.Debug("Reading BlobContainer...") if err := t.Resources.BlobContainer.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading Credentials...") + logrus.Debug("Reading Credentials...") if err := t.DataSources.Credentials.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading VirtualNetwork...") + logrus.Debug("Reading VirtualNetwork...") if err := t.Resources.VirtualNetwork.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading SecurityGroup...") + logrus.Debug("Reading SecurityGroup...") if err := t.Resources.SecurityGroup.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading Subnet...") + logrus.Debug("Reading Subnet...") if err := t.Resources.Subnet.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading VirtualMachineScaleSet...") + logrus.Debug("Reading VirtualMachineScaleSet...") if err := t.Resources.VirtualMachineScaleSet.Read(ctx); err != nil { return err } - log.Println("[INFO] Done!") + logrus.Debug("Done!") t.Attributes.Addresses = t.Resources.VirtualMachineScaleSet.Attributes.Addresses t.Attributes.Status = t.Resources.VirtualMachineScaleSet.Attributes.Status t.Attributes.Events = t.Resources.VirtualMachineScaleSet.Attributes.Events @@ -183,41 +184,41 @@ func (t *Task) Read(ctx context.Context) error { } func (t *Task) Delete(ctx context.Context) error { - log.Println("[INFO] Downloading Directory...") + logrus.Debug("Downloading Directory...") if t.Attributes.Environment.DirectoryOut != "" && t.Read(ctx) == nil { if err := t.Pull(ctx, t.Attributes.Environment.DirectoryOut); err != nil && err != common.NotFoundError { return err } } - log.Println("[INFO] Deleting VirtualMachineScaleSet...") + logrus.Debug("Deleting VirtualMachineScaleSet...") if err := t.Resources.VirtualMachineScaleSet.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting Subnet...") + logrus.Debug("Deleting Subnet...") if err := t.Resources.Subnet.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting SecurityGroup...") + logrus.Debug("Deleting SecurityGroup...") if err := t.Resources.SecurityGroup.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting VirtualNetwork...") + logrus.Debug("Deleting VirtualNetwork...") if err := t.Resources.VirtualNetwork.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting BlobContainer...") + logrus.Debug("Deleting BlobContainer...") if err := t.Resources.BlobContainer.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting StorageAccount...") + logrus.Debug("Deleting StorageAccount...") if err := t.Resources.StorageAccount.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting ResourceGroup...") + logrus.Debug("Deleting ResourceGroup...") if err := t.Resources.ResourceGroup.Delete(ctx); err != nil { return err } - log.Println("[INFO] Done!") + logrus.Debug("Done!") return nil } diff --git a/task/gcp/task.go b/task/gcp/task.go index 0db1dbeb..b4078c46 100644 --- a/task/gcp/task.go +++ b/task/gcp/task.go @@ -2,9 +2,10 @@ package gcp import ( "context" - "log" "net" + "github.com/sirupsen/logrus" + "terraform-provider-iterative/task/common" "terraform-provider-iterative/task/common/machine" "terraform-provider-iterative/task/common/ssh" @@ -140,65 +141,65 @@ type Task struct { } func (t *Task) Create(ctx context.Context) error { - log.Println("[INFO] Creating DefaultNetwork...") + logrus.Debug("Creating DefaultNetwork...") if err := t.DataSources.DefaultNetwork.Read(ctx); err != nil { return err } - log.Println("[INFO] Creating Image...") + logrus.Debug("Creating Image...") if err := t.DataSources.Image.Read(ctx); err != nil { return err } - log.Println("[INFO] Creating Bucket...") + logrus.Debug("Creating Bucket...") if err := t.Resources.Bucket.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating Credentials...") + logrus.Debug("Creating Credentials...") if err := t.DataSources.Credentials.Read(ctx); err != nil { return err } - log.Println("[INFO] Creating FirewallInternalEgress...") + logrus.Debug("Creating FirewallInternalEgress...") if err := t.Resources.FirewallInternalEgress.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating FirewallInternalIngress...") + logrus.Debug("Creating FirewallInternalIngress...") if err := t.Resources.FirewallInternalIngress.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating FirewallExternalEgress...") + logrus.Debug("Creating FirewallExternalEgress...") if err := t.Resources.FirewallExternalEgress.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating FirewallExternalIngress...") + logrus.Debug("Creating FirewallExternalIngress...") if err := t.Resources.FirewallExternalIngress.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating FirewallDenyEgress...") + logrus.Debug("Creating FirewallDenyEgress...") if err := t.Resources.FirewallDenyEgress.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating FirewallDenyIngress...") + logrus.Debug("Creating FirewallDenyIngress...") if err := t.Resources.FirewallDenyIngress.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating InstanceTemplate...") + logrus.Debug("Creating InstanceTemplate...") if err := t.Resources.InstanceTemplate.Create(ctx); err != nil { return err } - log.Println("[INFO] Creating InstanceGroupManager...") + logrus.Debug("Creating InstanceGroupManager...") if err := t.Resources.InstanceGroupManager.Create(ctx); err != nil { return err } - log.Println("[INFO] Uploading Directory...") + logrus.Debug("Uploading Directory...") if t.Attributes.Environment.Directory != "" { if err := t.Push(ctx, t.Attributes.Environment.Directory); err != nil { return err } } - log.Println("[INFO] Starting task...") + logrus.Debug("Starting task...") if err := t.Start(ctx); err != nil { return err } - log.Println("[INFO] Done!") + logrus.Debug("Done!") t.Attributes.Addresses = t.Resources.InstanceGroupManager.Attributes.Addresses t.Attributes.Status = t.Resources.InstanceGroupManager.Attributes.Status t.Attributes.Events = t.Resources.InstanceGroupManager.Attributes.Events @@ -206,55 +207,55 @@ func (t *Task) Create(ctx context.Context) error { } func (t *Task) Read(ctx context.Context) error { - log.Println("[INFO] Reading DefaultNetwork...") + logrus.Debug("Reading DefaultNetwork...") if err := t.DataSources.DefaultNetwork.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading Image...") + logrus.Debug("Reading Image...") if err := t.DataSources.Image.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading Bucket...") + logrus.Debug("Reading Bucket...") if err := t.Resources.Bucket.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading Credentials...") + logrus.Debug("Reading Credentials...") if err := t.DataSources.Credentials.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading FirewallInternalEgress...") + logrus.Debug("Reading FirewallInternalEgress...") if err := t.Resources.FirewallInternalEgress.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading FirewallInternalIngress...") + logrus.Debug("Reading FirewallInternalIngress...") if err := t.Resources.FirewallInternalIngress.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading FirewallExternalEgress...") + logrus.Debug("Reading FirewallExternalEgress...") if err := t.Resources.FirewallExternalEgress.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading FirewallExternalIngress...") + logrus.Debug("Reading FirewallExternalIngress...") if err := t.Resources.FirewallExternalIngress.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading FirewallDenyEgress...") + logrus.Debug("Reading FirewallDenyEgress...") if err := t.Resources.FirewallDenyEgress.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading FirewallDenyIngress...") + logrus.Debug("Reading FirewallDenyIngress...") if err := t.Resources.FirewallDenyIngress.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading InstanceTemplate...") + logrus.Debug("Reading InstanceTemplate...") if err := t.Resources.InstanceTemplate.Read(ctx); err != nil { return err } - log.Println("[INFO] Reading InstanceGroupManager...") + logrus.Debug("Reading InstanceGroupManager...") if err := t.Resources.InstanceGroupManager.Read(ctx); err != nil { return err } - log.Println("[INFO] Done!") + logrus.Debug("Done!") t.Attributes.Addresses = t.Resources.InstanceGroupManager.Attributes.Addresses t.Attributes.Status = t.Resources.InstanceGroupManager.Attributes.Status t.Attributes.Events = t.Resources.InstanceGroupManager.Attributes.Events @@ -262,49 +263,49 @@ func (t *Task) Read(ctx context.Context) error { } func (t *Task) Delete(ctx context.Context) error { - log.Println("[INFO] Downloading Directory...") + logrus.Debug("Downloading Directory...") if t.Attributes.Environment.DirectoryOut != "" && t.Read(ctx) == nil { if err := t.Pull(ctx, t.Attributes.Environment.DirectoryOut); err != nil && err != common.NotFoundError { return err } } - log.Println("[INFO] Deleting InstanceGroupManager...") + logrus.Debug("Deleting InstanceGroupManager...") if err := t.Resources.InstanceGroupManager.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting InstanceTemplate...") + logrus.Debug("Deleting InstanceTemplate...") if err := t.Resources.InstanceTemplate.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting FirewallInternalEgress...") + logrus.Debug("Deleting FirewallInternalEgress...") if err := t.Resources.FirewallInternalEgress.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting FirewallInternalIngress...") + logrus.Debug("Deleting FirewallInternalIngress...") if err := t.Resources.FirewallInternalIngress.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting FirewallExternalEgress...") + logrus.Debug("Deleting FirewallExternalEgress...") if err := t.Resources.FirewallExternalEgress.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting FirewallExternalIngress...") + logrus.Debug("Deleting FirewallExternalIngress...") if err := t.Resources.FirewallExternalIngress.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting FirewallDenyEgress...") + logrus.Debug("Deleting FirewallDenyEgress...") if err := t.Resources.FirewallDenyEgress.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting FirewallDenyIngress...") + logrus.Debug("Deleting FirewallDenyIngress...") if err := t.Resources.FirewallDenyIngress.Delete(ctx); err != nil { return err } - log.Println("[INFO] Deleting Bucket...") + logrus.Debug("Deleting Bucket...") if err := t.Resources.Bucket.Delete(ctx); err != nil { return err } - log.Println("[INFO] Done!") + logrus.Debug("Done!") return nil }