diff --git a/pkg/output/table.go b/pkg/output/table.go index 07226087f1..5a809899ab 100644 --- a/pkg/output/table.go +++ b/pkg/output/table.go @@ -165,12 +165,21 @@ func (t *Table) printCore(writer io.Writer, auto bool) error { var header []string var alignment []int + var omitEmptyFilter []string for i := 0; i < n; i++ { field := reflect.TypeOf(t.objects[0]).Elem().Field(i) tag := strings.Split(field.Tag.Get(t.format.String()), ",") if !slices.Contains(tag, "-") { - header = append(header, tag[0]) + isBoolType := field.Type.Kind() == reflect.Bool + includeColumn := slices.ContainsFunc(t.objects, func(object any) bool { + val := reflect.ValueOf(object).Elem().Field(i) + return !(slices.Contains(tag, "omitempty") && isZero(val)) + }) + if isBoolType || includeColumn { + header = append(header, tag[0]) + omitEmptyFilter = append(omitEmptyFilter, field.Name) + } switch field.Type.Kind() { case reflect.Int, reflect.Int32, reflect.Int64: @@ -182,6 +191,13 @@ func (t *Table) printCore(writer io.Writer, auto bool) error { } w.SetHeader(header) w.SetColumnAlignment(alignment) + for i := range t.objects { + hider := FieldHider{ + format: t.format, + filter: &omitEmptyFilter, + } + t.objects[i] = retag.Convert(t.objects[i], hider) + } for _, object := range t.objects { var row []string diff --git a/test/fixtures/output/ccpm/plugin-version-list-missing-environment.golden b/test/fixtures/output/ccpm/plugin-version-list-missing-environment.golden index 9039ab1d47..7c41ceb3e6 100644 --- a/test/fixtures/output/ccpm/plugin-version-list-missing-environment.golden +++ b/test/fixtures/output/ccpm/plugin-version-list-missing-environment.golden @@ -1,4 +1,4 @@ - Plugin ID | Plugin Name | ID | Version | Content Format | Documentation Link | Sensitive Config Properties | Connector Classes | Phase | Error Message | Environment --------------+---------------+------------+---------+----------------+---------------------------+-----------------------------+------------------------------------------------------------+-------+---------------+-------------- - ccp-123456 | CliPluginTest | ver-123456 | 1.0.0 | ZIP | https://docs.confluent.io | password, secret | io.confluent.kafka.connect.datagen.DatagenConnector:SOURCE | READY | | env-596 - ccp-123456 | CliPluginTest | ver-789012 | 2.0.0 | JAR | | | io.confluent.kafka.connect.datagen.DatagenConnector:SOURCE | READY | | env-596 + Plugin ID | Plugin Name | ID | Version | Content Format | Documentation Link | Sensitive Config Properties | Connector Classes | Phase | Environment +-------------+---------------+------------+---------+----------------+---------------------------+-----------------------------+------------------------------------------------------------+-------+-------------- + ccp-123456 | CliPluginTest | ver-123456 | 1.0.0 | ZIP | https://docs.confluent.io | password, secret | io.confluent.kafka.connect.datagen.DatagenConnector:SOURCE | READY | env-596 + ccp-123456 | CliPluginTest | ver-789012 | 2.0.0 | JAR | | | io.confluent.kafka.connect.datagen.DatagenConnector:SOURCE | READY | env-596 diff --git a/test/fixtures/output/ccpm/plugin-version-list.golden b/test/fixtures/output/ccpm/plugin-version-list.golden index b0e2a44708..982af81d63 100644 --- a/test/fixtures/output/ccpm/plugin-version-list.golden +++ b/test/fixtures/output/ccpm/plugin-version-list.golden @@ -1,4 +1,4 @@ - Plugin ID | Plugin Name | ID | Version | Content Format | Documentation Link | Sensitive Config Properties | Connector Classes | Phase | Error Message | Environment --------------+---------------+------------+---------+----------------+---------------------------+-----------------------------+------------------------------------------------------------+-------+---------------+-------------- - ccp-123456 | CliPluginTest | ver-123456 | 1.0.0 | ZIP | https://docs.confluent.io | password, secret | io.confluent.kafka.connect.datagen.DatagenConnector:SOURCE | READY | | env-123456 - ccp-123456 | CliPluginTest | ver-789012 | 2.0.0 | JAR | | | io.confluent.kafka.connect.datagen.DatagenConnector:SOURCE | READY | | env-123456 + Plugin ID | Plugin Name | ID | Version | Content Format | Documentation Link | Sensitive Config Properties | Connector Classes | Phase | Environment +-------------+---------------+------------+---------+----------------+---------------------------+-----------------------------+------------------------------------------------------------+-------+-------------- + ccp-123456 | CliPluginTest | ver-123456 | 1.0.0 | ZIP | https://docs.confluent.io | password, secret | io.confluent.kafka.connect.datagen.DatagenConnector:SOURCE | READY | env-123456 + ccp-123456 | CliPluginTest | ver-789012 | 2.0.0 | JAR | | | io.confluent.kafka.connect.datagen.DatagenConnector:SOURCE | READY | env-123456 diff --git a/test/fixtures/output/connect/cluster/list.golden b/test/fixtures/output/connect/cluster/list.golden index 28abbcd75d..58900aa5c1 100644 --- a/test/fixtures/output/connect/cluster/list.golden +++ b/test/fixtures/output/connect/cluster/list.golden @@ -1,5 +1,5 @@ - ID | Name | Status | Type | Trace -----------+----------------+---------+------+-------- - lcc-111 | az-connector-2 | RUNNING | Sink | - lcc-112 | az-connector-3 | RUNNING | Sink | - lcc-123 | az-connector | RUNNING | Sink | + ID | Name | Status | Type +----------+----------------+---------+------- + lcc-111 | az-connector-2 | RUNNING | Sink + lcc-112 | az-connector-3 | RUNNING | Sink + lcc-123 | az-connector | RUNNING | Sink diff --git a/test/fixtures/output/flink/detached-savepoint/list-successful.golden b/test/fixtures/output/flink/detached-savepoint/list-successful.golden index b80a5660aa..431d94a4ae 100644 --- a/test/fixtures/output/flink/detached-savepoint/list-successful.golden +++ b/test/fixtures/output/flink/detached-savepoint/list-successful.golden @@ -1,5 +1,5 @@ - Name | Path | Format | Backoff Limit | Creation Timestamp | UID -------------------+---------+-----------+---------------+-------------------------------+------ - test-savepoint1 | abc/def | CANONICAL | 10 | 2025-03-12 23:42:00 +0000 UTC | - test-savepoint2 | abc/def | CANONICAL | 10 | 2025-03-12 23:42:00 +0000 UTC | - test-savepoint3 | abc/def | CANONICAL | 10 | 2025-03-12 23:42:00 +0000 UTC | + Name | Path | Format | Backoff Limit | Creation Timestamp +------------------+---------+-----------+---------------+-------------------------------- + test-savepoint1 | abc/def | CANONICAL | 10 | 2025-03-12 23:42:00 +0000 UTC + test-savepoint2 | abc/def | CANONICAL | 10 | 2025-03-12 23:42:00 +0000 UTC + test-savepoint3 | abc/def | CANONICAL | 10 | 2025-03-12 23:42:00 +0000 UTC diff --git a/test/fixtures/output/flink/savepoint/list-successful-statement.golden b/test/fixtures/output/flink/savepoint/list-successful-statement.golden index ad0c258cf8..21d4ad5478 100644 --- a/test/fixtures/output/flink/savepoint/list-successful-statement.golden +++ b/test/fixtures/output/flink/savepoint/list-successful-statement.golden @@ -1,5 +1,5 @@ - Name | Application | Statement | Path | Format | Backoff Limit | UID | State -------------------+-------------+------------+---------+-----------+---------------+-----+-------- - test-savepoint1 | | statement1 | abc/def | CANONICAL | 10 | | - test-savepoint2 | | statement1 | abc/def | CANONICAL | 10 | | - test-savepoint3 | | statement1 | abc/def | CANONICAL | 10 | | + Name | Statement | Path | Format | Backoff Limit +------------------+------------+---------+-----------+---------------- + test-savepoint1 | statement1 | abc/def | CANONICAL | 10 + test-savepoint2 | statement1 | abc/def | CANONICAL | 10 + test-savepoint3 | statement1 | abc/def | CANONICAL | 10 diff --git a/test/fixtures/output/flink/savepoint/list-successful.golden b/test/fixtures/output/flink/savepoint/list-successful.golden index 51f37b0810..167e7d2617 100644 --- a/test/fixtures/output/flink/savepoint/list-successful.golden +++ b/test/fixtures/output/flink/savepoint/list-successful.golden @@ -1,5 +1,5 @@ - Name | Application | Statement | Path | Format | Backoff Limit | UID | State -------------------+--------------+-----------+---------+-----------+---------------+-----+-------- - test-savepoint1 | application1 | | abc/def | CANONICAL | 10 | | - test-savepoint2 | application1 | | abc/def | CANONICAL | 10 | | - test-savepoint3 | application1 | | abc/def | CANONICAL | 10 | | + Name | Application | Path | Format | Backoff Limit +------------------+--------------+---------+-----------+---------------- + test-savepoint1 | application1 | abc/def | CANONICAL | 10 + test-savepoint2 | application1 | abc/def | CANONICAL | 10 + test-savepoint3 | application1 | abc/def | CANONICAL | 10 diff --git a/test/fixtures/output/network/access-point/private-link/egress-endpoint/list.golden b/test/fixtures/output/network/access-point/private-link/egress-endpoint/list.golden index 1750b81ed2..0f48fc1c94 100644 --- a/test/fixtures/output/network/access-point/private-link/egress-endpoint/list.golden +++ b/test/fixtures/output/network/access-point/private-link/egress-endpoint/list.golden @@ -1,7 +1,7 @@ - ID | Name | Environment | Gateway | Phase | AWS VPC Endpoint Service | AWS VPC Endpoint | AWS VPC Endpoint DNS Name | Azure Private Link Service | Azure Private Link Subresource | Azure Private Endpoint | Azure Private Endpoint Domain | Azure Private Endpoint IP | Azure Private Endpoint Custom | GCP Private Service Connect | GCP Private Service Connect | GCP Private Service Connect | GCP Private Service Connect | High Availability - | | | | | | | | | Name | | | Address | DNS Config Domains | Endpoint Target | Endpoint Connection ID | Endpoint Name | Endpoint IP Address | ------------+------------------------------+-------------+----------+-------+---------------------------------------------------------+------------------+---------------------------+------------------------------------------------------------------------------------------------------------------------+--------------------------------+------------------------+-------------------------------+--------------------------------+------------------------------------+-----------------------------------------------------------------------------------+--------------------------------+--------------------------------+--------------------------------+-------------------- - ap-12345 | my-aws-egress-access-point | env-596 | gw-12345 | READY | com.amazonaws.vpce.us-west-2.vpce-svc-00000000000000000 | vpc-endpoint-id | vpc-endpoint-dns-name | | | | | | | | | | | true - ap-67890 | my-azure-egress-access-point | env-596 | gw-12345 | READY | | | | /subscriptions/0000000/resourceGroups/plsRgName/providers/Microsoft.Network/privateLinkServices/privateLinkServiceName | subresource | private-endpoint-id | domain.com | 10.2.0.68 | dbname.database.windows.net, | | | | | false - | | | | | | | | | | | | | dbname-region.database.windows.net | | | | | - ap-88888 | my-gcp-egress-access-point | env-596 | gw-12345 | READY | | | | | | | | | | projects/projectName/regions/us-central1/serviceAttachments/serviceAttachmentName | | | | false + ID | Name | Environment | Gateway | Phase | AWS VPC Endpoint Service | AWS VPC Endpoint | AWS VPC Endpoint DNS Name | Azure Private Link Service | Azure Private Link Subresource | Azure Private Endpoint | Azure Private Endpoint Domain | Azure Private Endpoint IP | Azure Private Endpoint Custom | GCP Private Service Connect | High Availability + | | | | | | | | | Name | | | Address | DNS Config Domains | Endpoint Target | +-----------+------------------------------+-------------+----------+-------+---------------------------------------------------------+------------------+---------------------------+------------------------------------------------------------------------------------------------------------------------+--------------------------------+------------------------+-------------------------------+--------------------------------+------------------------------------+-----------------------------------------------------------------------------------+-------------------- + ap-12345 | my-aws-egress-access-point | env-596 | gw-12345 | READY | com.amazonaws.vpce.us-west-2.vpce-svc-00000000000000000 | vpc-endpoint-id | vpc-endpoint-dns-name | | | | | | | | true + ap-67890 | my-azure-egress-access-point | env-596 | gw-12345 | READY | | | | /subscriptions/0000000/resourceGroups/plsRgName/providers/Microsoft.Network/privateLinkServices/privateLinkServiceName | subresource | private-endpoint-id | domain.com | 10.2.0.68 | dbname.database.windows.net, | | false + | | | | | | | | | | | | | dbname-region.database.windows.net | | + ap-88888 | my-gcp-egress-access-point | env-596 | gw-12345 | READY | | | | | | | | | | projects/projectName/regions/us-central1/serviceAttachments/serviceAttachmentName | false diff --git a/test/fixtures/output/network/gateway/list.golden b/test/fixtures/output/network/gateway/list.golden index 1868a3f8ea..4958bff681 100644 --- a/test/fixtures/output/network/gateway/list.golden +++ b/test/fixtures/output/network/gateway/list.golden @@ -1,9 +1,9 @@ - ID | Name | Environment | Region | Type | AWS Principal ARN | Azure Subscription | GCP IAM Principal | GCP Project | Phase | Zones | Account | Error Message ------------+--------------------------+-------------+-----------+--------------------------------+--------------------------------+--------------------------------------+-------------------------------------+---------------+-------+------------------------+--------------+---------------- - gw-07531 | my-gcp-gateway | env-596 | eastus | GcpEgressPrivateServiceConnect | | | | project-12345 | READY | | | - gw-09876 | my-azure-peering-gateway | env-596 | eastus2 | AzurePeering | | | | | READY | | | - gw-12345 | my-aws-gateway | env-596 | us-east-1 | AwsEgressPrivateLink | arn:aws:iam::123456789012:role | | | | READY | | | - gw-13570 | my-gcp-peering-gateway | env-596 | eastus2 | GcpPeering | | | g000000-a000-0a00-00aa-0000aaa0a0a0 | | READY | | | - gw-23456 | my-aws-gateway | env-596 | us-east-2 | AwsPrivateNetworkInterface | | | | | READY | us-east-2a, us-east-2b | 000000000000 | - gw-54321 | my-aws-peering-gateway | env-596 | us-east-2 | AwsPeering | | | | | READY | | | - gw-67890 | my-azure-gateway | env-596 | eastus | AzureEgressPrivateLink | | aa000000-a000-0a00-00aa-0000aaa0a0a0 | | | READY | | | + ID | Name | Environment | Region | Type | AWS Principal ARN | Azure Subscription | GCP IAM Principal | GCP Project | Phase | Zones | Account +-----------+--------------------------+-------------+-----------+--------------------------------+--------------------------------+--------------------------------------+-------------------------------------+---------------+-------+------------------------+--------------- + gw-07531 | my-gcp-gateway | env-596 | eastus | GcpEgressPrivateServiceConnect | | | | project-12345 | READY | | + gw-09876 | my-azure-peering-gateway | env-596 | eastus2 | AzurePeering | | | | | READY | | + gw-12345 | my-aws-gateway | env-596 | us-east-1 | AwsEgressPrivateLink | arn:aws:iam::123456789012:role | | | | READY | | + gw-13570 | my-gcp-peering-gateway | env-596 | eastus2 | GcpPeering | | | g000000-a000-0a00-00aa-0000aaa0a0a0 | | READY | | + gw-23456 | my-aws-gateway | env-596 | us-east-2 | AwsPrivateNetworkInterface | | | | | READY | us-east-2a, us-east-2b | 000000000000 + gw-54321 | my-aws-peering-gateway | env-596 | us-east-2 | AwsPeering | | | | | READY | | + gw-67890 | my-azure-gateway | env-596 | eastus | AzureEgressPrivateLink | | aa000000-a000-0a00-00aa-0000aaa0a0a0 | | | READY | | diff --git a/test/fixtures/output/network/list-name-cloud.golden b/test/fixtures/output/network/list-name-cloud.golden index 7c39eefb7d..133c162f8f 100644 --- a/test/fixtures/output/network/list-name-cloud.golden +++ b/test/fixtures/output/network/list-name-cloud.golden @@ -1,8 +1,8 @@ - ID | Name | Gateway | Cloud | Region | CIDR | Zones | Phase | Active Connection Types | DNS Resolution | Zone Info ------------+-------------------+-----------+-------+-----------+---------------+------------------------------+-------+-------------------------+----------------+--------------------------------- - n-abcde3 | prod-aws-us-east1 | | AWS | us-east-1 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | | use1-az1=10.200.0.0/27, - | | | | | | | | | | use1-az2=10.200.0.32/27, - | | | | | | | | | | use1-az3=10.200.0.64/27 - n-abcde4 | prod-aws-us-east1 | gw-abcde1 | AWS | us-west-2 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | | use1-az1=10.200.0.0/27, - | | | | | | | | | | use1-az2=10.200.0.32/27, - | | | | | | | | | | use1-az3=10.200.0.64/27 + ID | Name | Gateway | Cloud | Region | CIDR | Zones | Phase | Active Connection Types | Zone Info +-----------+-------------------+-----------+-------+-----------+---------------+------------------------------+-------+-------------------------+--------------------------------- + n-abcde3 | prod-aws-us-east1 | | AWS | us-east-1 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | use1-az1=10.200.0.0/27, + | | | | | | | | | use1-az2=10.200.0.32/27, + | | | | | | | | | use1-az3=10.200.0.64/27 + n-abcde4 | prod-aws-us-east1 | gw-abcde1 | AWS | us-west-2 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | use1-az1=10.200.0.0/27, + | | | | | | | | | use1-az2=10.200.0.32/27, + | | | | | | | | | use1-az3=10.200.0.64/27 diff --git a/test/fixtures/output/network/list-phase-connection.golden b/test/fixtures/output/network/list-phase-connection.golden index 10927b5e62..298891ef8d 100644 --- a/test/fixtures/output/network/list-phase-connection.golden +++ b/test/fixtures/output/network/list-phase-connection.golden @@ -1,20 +1,20 @@ - ID | Name | Gateway | Cloud | Region | CIDR | Zones | Phase | Active Connection Types | DNS Resolution | Zone Info ------------+----------------------+---------------+-------+-------------+---------------+--------------------------------+-------+-------------------------+----------------+--------------------------------- - n-abcde6 | prod-aws-eu-west1 | | AWS | eu-west-1 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | | use1-az1=10.200.0.0/27, - | | | | | | | | | | use1-az2=10.200.0.32/27, - | | | | | | | | | | use1-az3=10.200.0.64/27 - n-abcde3 | prod-aws-us-east1 | | AWS | us-east-1 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | | use1-az1=10.200.0.0/27, - | | | | | | | | | | use1-az2=10.200.0.32/27, - | | | | | | | | | | use1-az3=10.200.0.64/27 - n-abcde5 | | | AWS | us-east-1 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | | use1-az1=10.200.0.0/27, - | | | | | | | | | | use1-az2=10.200.0.32/27, - | | | | | | | | | | use1-az3=10.200.0.64/27 - n-abcde4 | prod-aws-us-east1 | gw-abcde1 | AWS | us-west-2 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | | use1-az1=10.200.0.0/27, - | | | | | | | | | | use1-az2=10.200.0.32/27, - | | | | | | | | | | use1-az3=10.200.0.64/27 - n-abcde7 | prod-azure-eastus2 | | AZURE | eastus2 | 10.0.0.0/16 | 1, 2, 3 | READY | PEERING | | 1=10.200.0.0/27, - | | | | | | | | | | 2=10.200.0.32/27, - | | | | | | | | | | 3=10.200.0.64/27 - n-abcde1 | prod-gcp-us-central1 | gateway-12345 | GCP | us-central1 | 10.1.0.0/16 | us-central1-a, us-central1-b, | READY | PEERING | | us-central1-a=10.200.0.0/27, - | | | | | | us-central1-c | | | | us-central1-b=10.200.0.32/27, - | | | | | | | | | | us-central1-c=10.200.0.64/27 + ID | Name | Gateway | Cloud | Region | CIDR | Zones | Phase | Active Connection Types | Zone Info +-----------+----------------------+---------------+-------+-------------+---------------+--------------------------------+-------+-------------------------+--------------------------------- + n-abcde6 | prod-aws-eu-west1 | | AWS | eu-west-1 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | use1-az1=10.200.0.0/27, + | | | | | | | | | use1-az2=10.200.0.32/27, + | | | | | | | | | use1-az3=10.200.0.64/27 + n-abcde3 | prod-aws-us-east1 | | AWS | us-east-1 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | use1-az1=10.200.0.0/27, + | | | | | | | | | use1-az2=10.200.0.32/27, + | | | | | | | | | use1-az3=10.200.0.64/27 + n-abcde5 | | | AWS | us-east-1 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | use1-az1=10.200.0.0/27, + | | | | | | | | | use1-az2=10.200.0.32/27, + | | | | | | | | | use1-az3=10.200.0.64/27 + n-abcde4 | prod-aws-us-east1 | gw-abcde1 | AWS | us-west-2 | 10.200.0.0/16 | use1-az1, use1-az2, use1-az3 | READY | TRANSITGATEWAY, PEERING | use1-az1=10.200.0.0/27, + | | | | | | | | | use1-az2=10.200.0.32/27, + | | | | | | | | | use1-az3=10.200.0.64/27 + n-abcde7 | prod-azure-eastus2 | | AZURE | eastus2 | 10.0.0.0/16 | 1, 2, 3 | READY | PEERING | 1=10.200.0.0/27, + | | | | | | | | | 2=10.200.0.32/27, + | | | | | | | | | 3=10.200.0.64/27 + n-abcde1 | prod-gcp-us-central1 | gateway-12345 | GCP | us-central1 | 10.1.0.0/16 | us-central1-a, us-central1-b, | READY | PEERING | us-central1-a=10.200.0.0/27, + | | | | | | us-central1-c | | | us-central1-b=10.200.0.32/27, + | | | | | | | | | us-central1-c=10.200.0.64/27 diff --git a/test/fixtures/output/network/list-region-cidr.golden b/test/fixtures/output/network/list-region-cidr.golden index 8184add440..f4ed6554e0 100644 --- a/test/fixtures/output/network/list-region-cidr.golden +++ b/test/fixtures/output/network/list-region-cidr.golden @@ -1,6 +1,6 @@ - ID | Name | Gateway | Cloud | Region | CIDR | Zones | Phase | Active Connection Types | DNS Resolution | Zone Info ------------+--------------------+---------+-------+---------+-------------+---------+-------+-------------------------+----------------+--------------------------------- - n-abcde2 | prod-azure-eastus2 | | AZURE | eastus2 | 10.0.0.0/16 | 1, 2, 3 | READY | PRIVATELINK | PRIVATE | - n-abcde7 | prod-azure-eastus2 | | AZURE | eastus2 | 10.0.0.0/16 | 1, 2, 3 | READY | PEERING | | 1=10.200.0.0/27, - | | | | | | | | | | 2=10.200.0.32/27, - | | | | | | | | | | 3=10.200.0.64/27 + ID | Name | Cloud | Region | CIDR | Zones | Phase | Active Connection Types | DNS Resolution | Zone Info +-----------+--------------------+-------+---------+-------------+---------+-------+-------------------------+----------------+--------------------------------- + n-abcde2 | prod-azure-eastus2 | AZURE | eastus2 | 10.0.0.0/16 | 1, 2, 3 | READY | PRIVATELINK | PRIVATE | + n-abcde7 | prod-azure-eastus2 | AZURE | eastus2 | 10.0.0.0/16 | 1, 2, 3 | READY | PEERING | | 1=10.200.0.0/27, + | | | | | | | | | 2=10.200.0.32/27, + | | | | | | | | | 3=10.200.0.64/27 diff --git a/test/fixtures/output/network/private-link/attachment/connection/list.golden b/test/fixtures/output/network/private-link/attachment/connection/list.golden index e0c0bce012..072569dfd5 100644 --- a/test/fixtures/output/network/private-link/attachment/connection/list.golden +++ b/test/fixtures/output/network/private-link/attachment/connection/list.golden @@ -1,7 +1,7 @@ - ID | Name | Cloud | Private Link Attachment | Phase | AWS VPC Endpoint ID | AWS VPC Endpoint Service Name | Azure Private Endpoint | Azure Private Link Service | Azure Private Link Service ID | GCP Service Attachment ID | GCP Private Service Connect - | | | | | | | Resource ID | Alias | | | Connection ID -----------------+----------------+-------+-------------------------+--------------+------------------------+---------------------------------------------------------+--------------------------------+------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------+--------------------------------- - plattc-111111 | aws-plattc-1 | AWS | platt-111111 | PROVISIONING | vpce-01234567890abcdef | | | | | | - plattc-111112 | aws-plattc-2 | AWS | platt-111111 | READY | vpce-01234567890abcdef | com.amazonaws.vpce.us-west-2.vpce-svc-01234567890abcdef | | | | | - plattc-111113 | aws-plattc-3 | AWS | platt-111111 | READY | vpce-01234567890abcdef | com.amazonaws.vpce.us-west-2.vpce-svc-01234567890abcdef | | | | | - plattc-azure | azure-plattc-1 | AZURE | platt-111111 | READY | | | azure-private-endpoint-id | azure-vnet-privatelink-1.a0a0aa00-a000-0aa0-a00a-0aaa0000a00a.eastus2.azure.privatelinkservice | /subscriptions/aa000000-a000-0a00-00aa-0000aaa0a0a0/resourceGroups/azure-vnet/providers/Microsoft.Network/privateLinkServices/azure-vnet-privatelink-1 | | + ID | Name | Cloud | Private Link Attachment | Phase | AWS VPC Endpoint ID | AWS VPC Endpoint Service Name | Azure Private Endpoint | Azure Private Link Service | Azure Private Link Service ID + | | | | | | | Resource ID | Alias | +----------------+----------------+-------+-------------------------+--------------+------------------------+---------------------------------------------------------+--------------------------------+------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------- + plattc-111111 | aws-plattc-1 | AWS | platt-111111 | PROVISIONING | vpce-01234567890abcdef | | | | + plattc-111112 | aws-plattc-2 | AWS | platt-111111 | READY | vpce-01234567890abcdef | com.amazonaws.vpce.us-west-2.vpce-svc-01234567890abcdef | | | + plattc-111113 | aws-plattc-3 | AWS | platt-111111 | READY | vpce-01234567890abcdef | com.amazonaws.vpce.us-west-2.vpce-svc-01234567890abcdef | | | + plattc-azure | azure-plattc-1 | AZURE | platt-111111 | READY | | | azure-private-endpoint-id | azure-vnet-privatelink-1.a0a0aa00-a000-0aa0-a00a-0aaa0000a00a.eastus2.azure.privatelinkservice | /subscriptions/aa000000-a000-0a00-00aa-0000aaa0a0a0/resourceGroups/azure-vnet/providers/Microsoft.Network/privateLinkServices/azure-vnet-privatelink-1 diff --git a/test/fixtures/output/network/private-link/attachment/list-name-cloud.golden b/test/fixtures/output/network/private-link/attachment/list-name-cloud.golden index 1a09d0831d..28300727f6 100644 --- a/test/fixtures/output/network/private-link/attachment/list-name-cloud.golden +++ b/test/fixtures/output/network/private-link/attachment/list-name-cloud.golden @@ -1,5 +1,4 @@ - ID | Name | Cloud | Region | AWS VPC Endpoint Service | Azure Private Link Service | Azure Private Link Service ID | GCP Service Attachment ID | Phase - | | | | | Alias | | | ----------------+-------------+-------+-----------+---------------------------------------------------------+--------------------------------+-------------------------------+---------------------------+-------------------------- - platt-111111 | aws-platt-1 | AWS | us-west-2 | | | | | PROVISIONING - platt-111112 | aws-platt-2 | AWS | us-west-2 | com.amazonaws.vpce.us-west-2.vpce-svc-01234567890abcdef | | | | WAITING_FOR_CONNECTIONS + ID | Name | Cloud | Region | AWS VPC Endpoint Service | Phase +---------------+-------------+-------+-----------+---------------------------------------------------------+-------------------------- + platt-111111 | aws-platt-1 | AWS | us-west-2 | | PROVISIONING + platt-111112 | aws-platt-2 | AWS | us-west-2 | com.amazonaws.vpce.us-west-2.vpce-svc-01234567890abcdef | WAITING_FOR_CONNECTIONS diff --git a/test/fixtures/output/network/private-link/attachment/list-region-phase.golden b/test/fixtures/output/network/private-link/attachment/list-region-phase.golden index d8b53e4f89..2d56b2bb27 100644 --- a/test/fixtures/output/network/private-link/attachment/list-region-phase.golden +++ b/test/fixtures/output/network/private-link/attachment/list-region-phase.golden @@ -1,4 +1,3 @@ - ID | Name | Cloud | Region | AWS VPC Endpoint Service | Azure Private Link Service | Azure Private Link Service ID | GCP Service Attachment ID | Phase - | | | | | Alias | | | ----------------+-------------+-------+-----------+--------------------------+--------------------------------+-------------------------------+---------------------------+--------------- - platt-111111 | aws-platt-1 | AWS | us-west-2 | | | | | PROVISIONING + ID | Name | Cloud | Region | Phase +---------------+-------------+-------+-----------+--------------- + platt-111111 | aws-platt-1 | AWS | us-west-2 | PROVISIONING diff --git a/test/fixtures/output/tableflow/catalog-integration/list.golden b/test/fixtures/output/tableflow/catalog-integration/list.golden index a90379080f..19023b783b 100644 --- a/test/fixtures/output/tableflow/catalog-integration/list.golden +++ b/test/fixtures/output/tableflow/catalog-integration/list.golden @@ -1,5 +1,5 @@ - ID | Name | Environment | Kafka Cluster | Type | Provider Integration ID | Endpoint | Warehouse | Allowed Scope | Workspace Endpoint | Catalog Name | Client ID | Suspended | Phase | Error Message --------------+-----------------+-------------+---------------+-----------+-------------------------+------------------------------------------------+-----------+---------------+------------------------------------------------+--------------+-----------+-----------+-----------+---------------- - tci-abc123 | my-aws-glue-ci | env-596 | lkc-123456 | aws | cspi-stgce89r7 | | | | | | | false | CONNECTED | - tci-def456 | my-snowflake-ci | env-596 | lkc-123456 | snowflake | | https://vuser1_polaris.snowflakecomputing.com/ | warehouse | allowed-scope | | | | false | PENDING | - tci-ghi789 | my-unity-ci | env-596 | lkc-123456 | unity | | | | | https://dbc-0e76d5eb-ff10.cloud.databricks.com | catalog-name | client-id | false | CONNECTED | + ID | Name | Environment | Kafka Cluster | Type | Provider Integration ID | Endpoint | Warehouse | Allowed Scope | Workspace Endpoint | Catalog Name | Client ID | Suspended | Phase +-------------+-----------------+-------------+---------------+-----------+-------------------------+------------------------------------------------+-----------+---------------+------------------------------------------------+--------------+-----------+-----------+------------ + tci-abc123 | my-aws-glue-ci | env-596 | lkc-123456 | aws | cspi-stgce89r7 | | | | | | | false | CONNECTED + tci-def456 | my-snowflake-ci | env-596 | lkc-123456 | snowflake | | https://vuser1_polaris.snowflakecomputing.com/ | warehouse | allowed-scope | | | | false | PENDING + tci-ghi789 | my-unity-ci | env-596 | lkc-123456 | unity | | | | | https://dbc-0e76d5eb-ff10.cloud.databricks.com | catalog-name | client-id | false | CONNECTED diff --git a/test/fixtures/output/tableflow/topic/list-topic.golden b/test/fixtures/output/tableflow/topic/list-topic.golden index 53000e9f60..ca9ddd5137 100644 --- a/test/fixtures/output/tableflow/topic/list-topic.golden +++ b/test/fixtures/output/tableflow/topic/list-topic.golden @@ -1,7 +1,7 @@ - Kafka Cluster | Topic Name | Enable Compaction | Enable Partitioning | Environment | Record Failure Strategy | Error Handling | Log Target | Retention Ms | Storage Type | Provider Integration ID | Bucket Name | Bucket Region | Container Name | Storage Account Name | Storage Region | Suspended | Table Formats | Table Path | Phase | Catalog Sync Status | Failing Table Format | Error Message | Write Mode -----------------+---------------+-------------------+---------------------+-------------+-------------------------+----------------+------------+--------------+--------------------------+-------------------------+-------------+---------------+----------------+----------------------+----------------+-----------+---------------+---------------------------------------------------------------------------+---------+---------------------+----------------------------------+---------------+------------- - lkc-123456 | topic-azure | true | true | env-596 | SKIP | | | 604800000 | AzureDataLakeStorageGen2 | cspi-stgce89r7 | | | Container1 | Acc1 | US1 | false | ICEBERG | s3://dummy-bucket-name-1//10011010/11101100/org-1/env-2/lkc-3/v1/tableId2 | RUNNING | | | | UPSERT - lkc-123456 | topic-byob | true | true | env-596 | SKIP | SKIP | | 604800000 | BYOS | cspi-stgce89r7 | bucket_1 | us-east-1 | | | | false | ICEBERG | s3://dummy-bucket-name-1//10011010/11101100/org-1/env-2/lkc-3/v1/tableId | RUNNING | cat-id-123=SUCCESS | DELTA=Connection timeout | | UPSERT - | | | | | | | | | | | | | | | | | | | | cat-id-456=FAILED | ICEBERG=Schema validation failed | | - lkc-123456 | topic-managed | true | true | env-596 | SUSPEND | SUSPEND | | 604800000 | MANAGED | | | | | | | false | DELTA | s3://dummy-bucket-name-1//10011010/11101100/org-1/env-2/lkc-3/v1/tableId | RUNNING | cat-id-123=SUCCESS | DELTA=Connection timeout | | APPEND - | | | | | | | | | | | | | | | | | | | | cat-id-456=FAILED | ICEBERG=Schema validation failed | | + Kafka Cluster | Topic Name | Enable Compaction | Enable Partitioning | Environment | Record Failure Strategy | Error Handling | Retention Ms | Storage Type | Provider Integration ID | Bucket Name | Bucket Region | Container Name | Storage Account Name | Storage Region | Suspended | Table Formats | Table Path | Phase | Catalog Sync Status | Failing Table Format | Write Mode +----------------+---------------+-------------------+---------------------+-------------+-------------------------+----------------+--------------+--------------------------+-------------------------+-------------+---------------+----------------+----------------------+----------------+-----------+---------------+---------------------------------------------------------------------------+---------+---------------------+----------------------------------+------------- + lkc-123456 | topic-azure | true | true | env-596 | SKIP | | 604800000 | AzureDataLakeStorageGen2 | cspi-stgce89r7 | | | Container1 | Acc1 | US1 | false | ICEBERG | s3://dummy-bucket-name-1//10011010/11101100/org-1/env-2/lkc-3/v1/tableId2 | RUNNING | | | UPSERT + lkc-123456 | topic-byob | true | true | env-596 | SKIP | SKIP | 604800000 | BYOS | cspi-stgce89r7 | bucket_1 | us-east-1 | | | | false | ICEBERG | s3://dummy-bucket-name-1//10011010/11101100/org-1/env-2/lkc-3/v1/tableId | RUNNING | cat-id-123=SUCCESS | DELTA=Connection timeout | UPSERT + | | | | | | | | | | | | | | | | | | | cat-id-456=FAILED | ICEBERG=Schema validation failed | + lkc-123456 | topic-managed | true | true | env-596 | SUSPEND | SUSPEND | 604800000 | MANAGED | | | | | | | false | DELTA | s3://dummy-bucket-name-1//10011010/11101100/org-1/env-2/lkc-3/v1/tableId | RUNNING | cat-id-123=SUCCESS | DELTA=Connection timeout | APPEND + | | | | | | | | | | | | | | | | | | | cat-id-456=FAILED | ICEBERG=Schema validation failed |