feat(): Allow to set keep_original_source globally

kestra-io · Dec 4, 2023 · 409bcd4 · 409bcd4
1 parent 55fc12d
commit 409bcd4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/internal/provider/client.go b/internal/provider/client.go
@@ -16,27 +16,29 @@ import (
 const DefaultURL string = "http://localhost:8080"
 
 type Client struct {
-	HTTPClient  *http.Client
-	Url         string
-	Username    *string
-	Password    *string
-	Jwt         *string
-	ExtraHeader *map[string]string
-	TenantId    *string
+	HTTPClient         *http.Client
+	Url                string
+	Username           *string
+	Password           *string
+	Jwt                *string
+	ExtraHeader        *map[string]string
+	TenantId           *string
+	KeepOriginalSource *bool
 }
 
 type RequestError struct {
 	StatusCode int
 	Err        error
 }
 
-func NewClient(url string, username *string, password *string, jwt *string, extraHeaders *interface{}, tenantId *string) (*Client, error) {
+func NewClient(url string, username *string, password *string, jwt *string, extraHeaders *interface{}, tenantId *string, keepOriginalSource *bool) (*Client, error) {
 	c := Client{
 		HTTPClient: &http.Client{Timeout: 10 * time.Second},
 		Url:        DefaultURL,
 	}
 
 	c.Url = url
+	c.KeepOriginalSource = keepOriginalSource
 
 	if (username != nil) && (password != nil) {
 		c.Username = username

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -66,6 +66,12 @@ func New(version string, tenant *string) func() *schema.Provider {
 					Optional:    true,
 					Description: "Extra headers to add to every request",
 				},
+				"keep_original_source": &schema.Schema{
+					Type:        schema.TypeBool,
+					Optional:    true,
+					Description: "Keep original source code, keeping comment and indentation.",
+					DefaultFunc: schema.EnvDefaultFunc("KESTRA_KEEP_ORIGINAL_SOURCE", true),
+				},
 			},
 			DataSourcesMap: map[string]*schema.Resource{
 				"kestra_binding":        dataSourceBinding(),
@@ -99,6 +105,7 @@ func New(version string, tenant *string) func() *schema.Provider {
 			password := d.Get("password").(string)
 			jwt := d.Get("jwt").(string)
 			extraHeaders := d.Get("extra_headers")
+			keepOriginalSource := d.Get("keep_original_source").(bool)
 
 			tenantId := ""
 			if tenant != nil {
@@ -109,7 +116,7 @@ func New(version string, tenant *string) func() *schema.Provider {
 
 			var diags diag.Diagnostics
 
-			c, err := NewClient(url, &username, &password, &jwt, &extraHeaders, &tenantId)
+			c, err := NewClient(url, &username, &password, &jwt, &extraHeaders, &tenantId, &keepOriginalSource)
 			if err != nil {
 				return nil, diag.FromErr(err)
 			}

diff --git a/internal/provider/resource_flow.go b/internal/provider/resource_flow.go
@@ -44,7 +44,6 @@ func resourceFlow() *schema.Resource {
 				Description: "Use the content as source code, keeping comment and indentation.",
 				Type:        schema.TypeBool,
 				Optional:    true,
-				Default:     true,
 			},
 			"content": {
 				Description:      "The flow full content in yaml string.",
@@ -63,8 +62,18 @@ func resourceFlow() *schema.Resource {
 func resourceFlowCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	c := meta.(*Client)
 	var diags diag.Diagnostics
+	var yamlSourceCode bool
+
+	// GetOkExists is deprecated but the GetOk does not work correctly with boolean
+	// Even if you set default to nil for the props, it will always return false if prop is set
+	localKeepOriginalSource, isLocalSet := d.GetOkExists("keep_original_source")
+
+	if isLocalSet == true {
+		yamlSourceCode = localKeepOriginalSource.(bool)
+	} else {
+		yamlSourceCode = *c.KeepOriginalSource
+	}
 
-	yamlSourceCode := d.Get("keep_original_source").(bool)
 	tenantId := c.TenantId
 
 	if yamlSourceCode == true {