Merge pull request #42 from DrFaust92/conn-remove

Connection - fix removing optional args
DrFaust92 · Nov 24, 2023 · d5d6048 · d5d6048
2 parents 74256f1 + 78c69cd
commit d5d6048
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/docs/resources/airflow_variable.md b/docs/resources/airflow_variable.md
@@ -25,6 +25,7 @@ The following arguments are supported:
 
 * `key` - (Required) The variable key.
 * `value` - (Required) The variable value.
+* `description` - (Optional) The variable description.
 
 ## Attributes Reference
 

diff --git a/internal/provider/resource_connection.go b/internal/provider/resource_connection.go
@@ -174,22 +174,32 @@ func resourceConnectionUpdate(ctx context.Context, d *schema.ResourceData, m int
 
 	if v, ok := d.GetOk("host"); ok {
 		conn.SetHost(v.(string))
+	} else {
+		conn.SetHostNil()
 	}
 
 	if v, ok := d.GetOk("description"); ok {
 		conn.SetDescription(v.(string))
+	} else {
+		conn.SetDescriptionNil()
 	}
 
 	if v, ok := d.GetOk("login"); ok {
 		conn.SetLogin(v.(string))
+	} else {
+		conn.SetLoginNil()
 	}
 
 	if v, ok := d.GetOk("schema"); ok {
 		conn.SetSchema(v.(string))
+	} else {
+		conn.SetSchemaNil()
 	}
 
 	if v, ok := d.GetOk("port"); ok {
 		conn.SetPort(int32(v.(int)))
+	} else {
+		conn.SetPortNil()
 	}
 
 	if v, ok := d.GetOk("password"); ok && v.(string) != "" {
@@ -198,6 +208,8 @@ func resourceConnectionUpdate(ctx context.Context, d *schema.ResourceData, m int
 
 	if v, ok := d.GetOk("extra"); ok {
 		conn.SetExtra(v.(string))
+	} else {
+		conn.SetExtraNil()
 	}
 
 	_, _, err := client.ConnectionApi.PatchConnection(pcfg.AuthContext, connId).Connection(conn).Execute()

diff --git a/internal/provider/resource_connection_test.go b/internal/provider/resource_connection_test.go
@@ -78,6 +78,19 @@ func TestAccAirflowConnection_full(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "description", rNameUpdated),
 				),
 			},
+			{
+				Config: testAccAirflowConnectionConfigBasic(rName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "connection_id", rName),
+					resource.TestCheckResourceAttr(resourceName, "conn_type", "http"),
+					resource.TestCheckResourceAttr(resourceName, "extra", ""),
+					resource.TestCheckResourceAttr(resourceName, "description", ""),
+					resource.TestCheckResourceAttr(resourceName, "port", "0"),
+					resource.TestCheckResourceAttr(resourceName, "schema", ""),
+					resource.TestCheckResourceAttr(resourceName, "login", ""),
+					resource.TestCheckResourceAttr(resourceName, "host", ""),
+				),
+			},
 		},
 	})
 }