webhook source resource: add url attr

Author: bobbyiliev

docs/resources/source_webhook.md

@@ -75,6 +75,7 @@ resource "materialize_source_webhook" "example_webhook" {
 - `id` (String) The ID of this resource.
 - `qualified_sql_name` (String) The fully qualified name of the source.
 - `size` (String) The size of the cluster maintaining this source.
+- `url` (String) The webhook URL that can be used to send data to this source.
 
 <a id="nestedblock--check_options"></a>
 ### Nested Schema for `check_options`

pkg/materialize/source.go

@@ -124,6 +124,7 @@ type SourceParams struct {
 	ClusterName            sql.NullString `db:"cluster_name"`
 	Comment                sql.NullString `db:"comment"`
 	OwnerName              sql.NullString `db:"owner_name"`
+	WebhookUrl             sql.NullString `db:"webhook_url"`
 	Privileges             pq.StringArray `db:"privileges"`
 }
 
@@ -142,6 +143,7 @@ var sourceQuery = NewBaseQuery(`
 			mz_clusters.name as cluster_name,
 			comments.comment AS comment,
 			mz_roles.name AS owner_name,
+			mz_webhook_sources.url AS webhook_url,
 			mz_sources.privileges
 		FROM mz_sources
 		JOIN mz_schemas
@@ -163,7 +165,9 @@ var sourceQuery = NewBaseQuery(`
 			FROM mz_internal.mz_comments
 			WHERE object_type = 'source'
 		) comments
-			ON mz_sources.id = comments.id`)
+			ON mz_sources.id = comments.id
+		LEFT JOIN mz_internal.mz_webhook_sources
+			ON mz_sources.id = mz_webhook_sources.id`)
 
 func SourceId(conn *sqlx.DB, obj MaterializeObject) (string, error) {
 	p := map[string]string{

pkg/provider/acceptance_source_webhook_test.go

@@ -42,6 +42,7 @@ func TestAccSourceWebhook_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "check_options.1.field.0.headers", "true"),
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "check_options.2.field.0.secret.0.name", secretName),
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "check_expression", "headers->'authorization' = BASIC_HOOK_AUTH"),
+					resource.TestCheckResourceAttrSet("materialize_source_webhook.test", "url"),
 				),
 			},
 			{
@@ -76,6 +77,7 @@ func TestAccSourceWebhookSegment_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "check_options.2.alias", "secret"),
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "check_options.2.bytes", "true"),
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "check_expression", "decode(headers->'x-signature', 'hex') = hmac(body, secret, 'sha1')"),
+					resource.TestCheckResourceAttrSet("materialize_source_webhook.test", "url"),
 				),
 			},
 			{
@@ -107,6 +109,7 @@ func TestAccSourceWebhookRudderstack_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "check_options.1.field.0.headers", "true"),
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "check_options.2.field.0.secret.0.name", "rudderstack_basic_auth"),
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "check_expression", "headers->'authorization' = rudderstack_basic_auth"),
+					resource.TestCheckResourceAttrSet("materialize_source_webhook.test", "url"),
 				),
 			},
 			{
@@ -137,6 +140,7 @@ func TestAccSourceWebhook_update(t *testing.T) {
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "name", sourceName),
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "ownership_role", "mz_system"),
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "comment", "Comment"),
+					resource.TestCheckResourceAttrSet("materialize_source_webhook.test", "url"),
 				),
 			},
 			{
@@ -146,6 +150,7 @@ func TestAccSourceWebhook_update(t *testing.T) {
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "name", newSourceName),
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "ownership_role", roleName),
 					resource.TestCheckResourceAttr("materialize_source_webhook.test", "comment", "New Comment"),
+					resource.TestCheckResourceAttrSet("materialize_source_webhook.test", "url"),
 				),
 			},
 		},

pkg/resources/resource_source.go

@@ -61,6 +61,11 @@ func sourceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) d
 		return diag.FromErr(err)
 	}
 
+	// Set the webhook URL if this is a webhook source
+	if err := d.Set("url", s.WebhookUrl.String); err != nil {
+		return diag.FromErr(err)
+	}
+
 	if v, ok := d.GetOk("envelope"); ok {
 		envelope := v.([]interface{})[0].(map[string]interface{})
 		if upsertOptions, ok := envelope["upsert_options"].([]interface{}); ok && len(upsertOptions) > 0 {

pkg/resources/resource_source_webhook.go

@@ -28,6 +28,11 @@ var sourceWebhookSchema = map[string]*schema.Schema{
 		Type:        schema.TypeString,
 		Computed:    true,
 	},
+	"url": {
+		Description: "The webhook URL that can be used to send data to this source.",
+		Type:        schema.TypeString,
+		Computed:    true,
+	},
 	"body_format": {
 		Description: "The body format of the webhook.",
 		Type:        schema.TypeString,

pkg/testhelpers/mock_scans.go

@@ -546,6 +546,7 @@ func MockSourceScan(mock sqlmock.Sqlmock, predicate string) {
 		mz_clusters.name as cluster_name,
 		comments.comment AS comment,
 		mz_roles.name AS owner_name,
+		mz_webhook_sources.url AS webhook_url,
 		mz_sources.privileges
 	FROM mz_sources
 	JOIN mz_schemas
@@ -567,11 +568,13 @@ func MockSourceScan(mock sqlmock.Sqlmock, predicate string) {
 		FROM mz_internal.mz_comments
 		WHERE object_type = 'source'
 	\) comments
-		ON mz_sources.id = comments.id`
+		ON mz_sources.id = comments.id
+	LEFT JOIN mz_internal.mz_webhook_sources
+		ON mz_sources.id = mz_webhook_sources.id`
 
 	q := mockQueryBuilder(b, predicate, "")
-	ir := mock.NewRows([]string{"id", "name", "schema_name", "database_name", "source_type", "size", "envelope_type", "connection_name", "connection_schema_name", "connection_database_name", "cluster_name", "comment", "owner_name", "privileges"}).
-		AddRow("u1", "source", "schema", "database", "kafka", "small", "BYTES", "conn", "public", "materialize", "cluster", nil, "joe", defaultPrivilege)
+	ir := mock.NewRows([]string{"id", "name", "schema_name", "database_name", "source_type", "size", "envelope_type", "connection_name", "connection_schema_name", "connection_database_name", "cluster_name", "comment", "owner_name", "webhook_url", "privileges"}).
+		AddRow("u1", "source", "schema", "database", "kafka", "small", "BYTES", "conn", "public", "materialize", "cluster", nil, "joe", "https://webhook.url/example", defaultPrivilege)
 	mock.ExpectQuery(q).WillReturnRows(ir)
 }