Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependencies: updating hashicorp/go-azure-sdk and tombuildsstuff/kermit #19698

Merged
merged 3 commits into from
Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.1.2
github.com/hashicorp/go-azure-helpers v0.47.0
github.com/hashicorp/go-azure-sdk v0.20221207.1121859
github.com/hashicorp/go-azure-sdk v0.20221215.1122558
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.3
github.com/hashicorp/go-version v1.6.0
Expand All @@ -25,7 +25,7 @@ require (
github.com/rickb777/date v1.12.5-0.20200422084442-6300e543c4d9
github.com/sergi/go-diff v1.2.0
github.com/tombuildsstuff/giovanni v0.20.0
github.com/tombuildsstuff/kermit v0.20221125.1100802
github.com/tombuildsstuff/kermit v0.20221207.1110610
golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
gopkg.in/yaml.v3 v3.0.1
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg=
github.com/hashicorp/go-azure-helpers v0.47.0 h1:E90ZN2hqMtzI+tfGWCnNtyLZYG4csoKSs+hWZZ8ywSM=
github.com/hashicorp/go-azure-helpers v0.47.0/go.mod h1:WiJNl0fD6PoM/MYuGTZ8yuzIaXQR3m2H2g6+EJ8nSwc=
github.com/hashicorp/go-azure-sdk v0.20221207.1121859 h1:FVhKaMCtpeNfa+aoiuFt62rywpvY5pBEKtxgN35OnAo=
github.com/hashicorp/go-azure-sdk v0.20221207.1121859/go.mod h1:BEjoURzcFwd+K3MqkbOt9jArIIrsqpBQ2Gz6DdemFIs=
github.com/hashicorp/go-azure-sdk v0.20221215.1122558 h1:At8bqfYNkvqPeXwXWJbJAtrlpU55WoJN9+DpHBdcHts=
github.com/hashicorp/go-azure-sdk v0.20221215.1122558/go.mod h1:BEjoURzcFwd+K3MqkbOt9jArIIrsqpBQ2Gz6DdemFIs=
github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
Expand Down Expand Up @@ -350,8 +350,8 @@ github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
github.com/tombuildsstuff/giovanni v0.20.0 h1:IM/I/iNWMXnPYwcSq8uxV7TKDlv7Nejq0bRK9i6O/C0=
github.com/tombuildsstuff/giovanni v0.20.0/go.mod h1:66KVLYma2whJhEdxPSPL3GQHkulhK+C5CluKfHGfPF4=
github.com/tombuildsstuff/kermit v0.20221125.1100802 h1:oWMrM2i4/7sJY2pacKxEJFuG6oK8ggk0nC5nRgEnC7I=
github.com/tombuildsstuff/kermit v0.20221125.1100802/go.mod h1:rLa19LUGz+w1EbdCcj+X4tK/goaTp1hQtdCHK7sbFz4=
github.com/tombuildsstuff/kermit v0.20221207.1110610 h1:WzvCKNwvnbCGTEu+YtTDgrOZ6r6Lb6G6CEEziFIPUms=
github.com/tombuildsstuff/kermit v0.20221207.1110610/go.mod h1:rLa19LUGz+w1EbdCcj+X4tK/goaTp1hQtdCHK7sbFz4=
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,28 +111,37 @@ func flattenPrivateEndpointConnections(input *[]workspaces.PrivateEndpointConnec
}

for _, v := range *input {
result := make(map[string]interface{})

if name := v.Name; name != nil {
result["name"] = *name
name := ""
if v.Name != nil {
name = *v.Name
}

if id := v.Id; id != nil {
result["workspace_private_endpoint_id"] = *id
workspacePrivateEndpointId := ""
if v.Id != nil {
workspacePrivateEndpointId = *v.Id
}

connState := v.Properties.PrivateLinkServiceConnectionState
if description := connState.Description; description != nil {
result["description"] = *description
actionRequired := ""
if connState.ActionsRequired != nil {
actionRequired = *connState.ActionsRequired
}
if status := connState.Status; status != "" {
result["status"] = status
description := ""
if connState.Description != nil {
description = *connState.Description
}
if actionReq := connState.ActionRequired; actionReq != nil {
result["action_required"] = *actionReq
status := ""
if connState.Status != "" {
status = string(connState.Status)
}

results = append(results, result)
results = append(results, map[string]interface{}{
"action_required": actionRequired,
"description": description,
"name": name,
"status": status,
"workspace_private_endpoint_id": workspacePrivateEndpointId,
})
}

return results
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestAccDatabricksWorkspacePrivateEndpointConnectionDataSource_basic(t *test
check.That(data.ResourceName).Key("connections.0.workspace_private_endpoint_id").Exists(),
check.That(data.ResourceName).Key("connections.0.status").Exists(),
check.That(data.ResourceName).Key("connections.0.description").Exists(),
check.That(data.ResourceName).Key("connections.0.action_required").IsEmpty(),
check.That(data.ResourceName).Key("connections.0.action_required").HasValue("None"),
),
},
})
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ github.com/hashicorp/go-azure-helpers/resourcemanager/zones
github.com/hashicorp/go-azure-helpers/resourceproviders
github.com/hashicorp/go-azure-helpers/sender
github.com/hashicorp/go-azure-helpers/storage
# github.com/hashicorp/go-azure-sdk v0.20221207.1121859
# github.com/hashicorp/go-azure-sdk v0.20221215.1122558
## explicit; go 1.18
github.com/hashicorp/go-azure-sdk/resource-manager/aad/2021-05-01/domainservices
github.com/hashicorp/go-azure-sdk/resource-manager/aadb2c/2021-04-01-preview
Expand Down Expand Up @@ -626,7 +626,7 @@ github.com/tombuildsstuff/giovanni/storage/accesscontrol
github.com/tombuildsstuff/giovanni/storage/internal/endpoints
github.com/tombuildsstuff/giovanni/storage/internal/metadata
github.com/tombuildsstuff/giovanni/version
# github.com/tombuildsstuff/kermit v0.20221125.1100802
# github.com/tombuildsstuff/kermit v0.20221207.1110610
## explicit; go 1.18
github.com/tombuildsstuff/kermit/sdk/appplatform/2022-11-01-preview/appplatform
github.com/tombuildsstuff/kermit/sdk/compute/2022-08-01/compute
Expand Down