Skip to content

Commit 7d4431a

Browse files
dependabot[bot]bflad
dependabot[bot]
and
bflad
authored
Bump github.com/hashicorp/terraform-plugin-log from 0.2.1 to 0.3.0 (#166)
* Bump github.com/hashicorp/terraform-plugin-log from 0.2.1 to 0.3.0 Bumps [github.com/hashicorp/terraform-plugin-log](https://github.com/hashicorp/terraform-plugin-log) from 0.2.1 to 0.3.0. - [Release notes](https://github.com/hashicorp/terraform-plugin-log/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-log/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-plugin-log@v0.2.1...v0.3.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-log dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * all: Update calls to terraform-plugin-log for function parameter breaking change Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brian Flad <[email protected]>
1 parent 8da41e2 commit 7d4431a

File tree

7 files changed

+89
-86
lines changed

7 files changed

+89
-86
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ go 1.16
44

55
require (
66
github.com/google/go-cmp v0.5.7
7-
github.com/hashicorp/go-hclog v1.1.0
7+
github.com/hashicorp/go-hclog v1.2.0
88
github.com/hashicorp/go-plugin v1.4.3
99
github.com/hashicorp/go-uuid v1.0.2
10-
github.com/hashicorp/terraform-plugin-log v0.2.1
10+
github.com/hashicorp/terraform-plugin-log v0.3.0
1111
github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896
1212
github.com/mitchellh/go-testing-interface v1.14.1
1313
github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce

‎go.sum‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,15 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
5454
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
5555
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
5656
github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
57-
github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
58-
github.com/hashicorp/go-hclog v1.1.0 h1:QsGcniKx5/LuX2eYoeL+Np3UKYPNaN7YKpTh29h8rbw=
59-
github.com/hashicorp/go-hclog v1.1.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
57+
github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM=
58+
github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
6059
github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM=
6160
github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
6261
github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
6362
github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
6463
github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
65-
github.com/hashicorp/terraform-plugin-log v0.2.1 h1:hl0G6ctSx7DRTE62VNsPWrq7d+JWy1kjk9ApOFrCq3I=
66-
github.com/hashicorp/terraform-plugin-log v0.2.1/go.mod h1:RW/n0x4dyITmenuirZ1ViPQGP5JQdPTZ4Wwc0rLKi94=
64+
github.com/hashicorp/terraform-plugin-log v0.3.0 h1:NPENNOjaJSVX0f7JJTl4f/2JKRPQ7S2ZN9B4NSqq5kA=
65+
github.com/hashicorp/terraform-plugin-log v0.3.0/go.mod h1:EjueSP/HjlyFAsDqt+okpCPjkT4NDynAe32AeDC4vps=
6766
github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 h1:1FGtlkJw87UsTMg5s8jrekrHmUPUJaMcu6ELiVhQrNw=
6867
github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896/go.mod h1:bzBPnUIkI0RxauU8Dqo+2KrZZ28Cf48s8V6IHt3p4co=
6968
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0=

‎internal/logging/keys.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ package logging
55
// Practitioners or tooling reading logs may be depending on these keys, so be
66
// conscious of that when changing them.
77
const (
8+
// Underlying error string
9+
KeyError = "error"
10+
811
// A unique ID for the RPC request
912
KeyRequestID = "tf_req_id"
1013

‎internal/logging/protocol.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ const (
1212
)
1313

1414
// ProtocolError emits a protocol subsystem log at ERROR level.
15-
func ProtocolError(ctx context.Context, msg string, args ...interface{}) {
16-
tfsdklog.SubsystemError(ctx, SubsystemProto, msg, args)
15+
func ProtocolError(ctx context.Context, msg string, additionalFields ...map[string]interface{}) {
16+
tfsdklog.SubsystemError(ctx, SubsystemProto, msg, additionalFields...)
1717
}
1818

1919
// ProtocolTrace emits a protocol subsystem log at TRACE level.
20-
func ProtocolTrace(ctx context.Context, msg string, args ...interface{}) {
21-
tfsdklog.SubsystemTrace(ctx, SubsystemProto, msg, args)
20+
func ProtocolTrace(ctx context.Context, msg string, additionalFields ...map[string]interface{}) {
21+
tfsdklog.SubsystemTrace(ctx, SubsystemProto, msg, additionalFields...)
2222
}

‎internal/logging/protocol_data.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,18 @@ func ProtocolData(ctx context.Context, dataDir string, rpc string, message strin
5757

5858
fileName := fmt.Sprintf("%d_%s_%s_%s.%s", time.Now().Unix(), rpc, message, field, fileExtension)
5959
filePath := path.Join(dataDir, fileName)
60+
logFields := map[string]interface{}{KeyProtocolDataFile: filePath} // should not be persisted using With()
6061

61-
ProtocolTrace(ctx, "Writing protocol data file", KeyProtocolDataFile, filePath)
62+
ProtocolTrace(ctx, "Writing protocol data file", logFields)
6263

6364
err := os.WriteFile(filePath, fileContents, 0644)
6465

6566
if err != nil {
66-
ProtocolError(ctx, fmt.Sprintf("Unable to write protocol data file: %s", err), KeyProtocolDataFile, filePath)
67+
ProtocolError(ctx, fmt.Sprintf("Unable to write protocol data file: %s", err), logFields)
6768
return
6869
}
6970

70-
ProtocolTrace(ctx, "Wrote protocol data file", KeyProtocolDataFile, filePath)
71+
ProtocolTrace(ctx, "Wrote protocol data file", logFields)
7172
}
7273

7374
func protocolDataDynamicValue5(_ context.Context, value *tfprotov5.DynamicValue) (string, []byte) {

‎tfprotov5/tf5server/server.go‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -491,19 +491,19 @@ func (s *server) GetSchema(ctx context.Context, req *tfplugin5.GetProviderSchema
491491
defer logging.ProtocolTrace(ctx, "Served request")
492492
r, err := fromproto.GetProviderSchemaRequest(req)
493493
if err != nil {
494-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
494+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
495495
return nil, err
496496
}
497497
logging.ProtocolTrace(ctx, "Calling downstream")
498498
resp, err := s.downstream.GetProviderSchema(ctx, r)
499499
if err != nil {
500-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
500+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
501501
return nil, err
502502
}
503503
logging.ProtocolTrace(ctx, "Called downstream")
504504
ret, err := toproto.GetProviderSchema_Response(resp)
505505
if err != nil {
506-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
506+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
507507
return nil, err
508508
}
509509
return ret, nil
@@ -518,21 +518,21 @@ func (s *server) PrepareProviderConfig(ctx context.Context, req *tfplugin5.Prepa
518518
defer logging.ProtocolTrace(ctx, "Served request")
519519
r, err := fromproto.PrepareProviderConfigRequest(req)
520520
if err != nil {
521-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
521+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
522522
return nil, err
523523
}
524524
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Request", "Config", r.Config)
525525
logging.ProtocolTrace(ctx, "Calling downstream")
526526
resp, err := s.downstream.PrepareProviderConfig(ctx, r)
527527
if err != nil {
528-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
528+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
529529
return nil, err
530530
}
531531
logging.ProtocolTrace(ctx, "Called downstream")
532532
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Response", "PreparedConfig", resp.PreparedConfig)
533533
ret, err := toproto.PrepareProviderConfig_Response(resp)
534534
if err != nil {
535-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
535+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
536536
return nil, err
537537
}
538538
return ret, nil
@@ -547,20 +547,20 @@ func (s *server) Configure(ctx context.Context, req *tfplugin5.Configure_Request
547547
defer logging.ProtocolTrace(ctx, "Served request")
548548
r, err := fromproto.ConfigureProviderRequest(req)
549549
if err != nil {
550-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
550+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
551551
return nil, err
552552
}
553553
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Request", "Config", r.Config)
554554
logging.ProtocolTrace(ctx, "Calling downstream")
555555
resp, err := s.downstream.ConfigureProvider(ctx, r)
556556
if err != nil {
557-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
557+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
558558
return nil, err
559559
}
560560
logging.ProtocolTrace(ctx, "Called downstream")
561561
ret, err := toproto.Configure_Response(resp)
562562
if err != nil {
563-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
563+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
564564
return nil, err
565565
}
566566
return ret, nil
@@ -588,13 +588,13 @@ func (s *server) Stop(ctx context.Context, req *tfplugin5.Stop_Request) (*tfplug
588588
defer logging.ProtocolTrace(ctx, "Served request")
589589
r, err := fromproto.StopProviderRequest(req)
590590
if err != nil {
591-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
591+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
592592
return nil, err
593593
}
594594
logging.ProtocolTrace(ctx, "Calling downstream")
595595
resp, err := s.downstream.StopProvider(ctx, r)
596596
if err != nil {
597-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
597+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
598598
return nil, err
599599
}
600600
logging.ProtocolTrace(ctx, "Called downstream")
@@ -603,7 +603,7 @@ func (s *server) Stop(ctx context.Context, req *tfplugin5.Stop_Request) (*tfplug
603603
logging.ProtocolTrace(ctx, "Closed all our contexts")
604604
ret, err := toproto.Stop_Response(resp)
605605
if err != nil {
606-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
606+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
607607
return nil, err
608608
}
609609
return ret, nil
@@ -619,20 +619,20 @@ func (s *server) ValidateDataSourceConfig(ctx context.Context, req *tfplugin5.Va
619619
defer logging.ProtocolTrace(ctx, "Served request")
620620
r, err := fromproto.ValidateDataSourceConfigRequest(req)
621621
if err != nil {
622-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
622+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
623623
return nil, err
624624
}
625625
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Request", "Config", r.Config)
626626
logging.ProtocolTrace(ctx, "Calling downstream")
627627
resp, err := s.downstream.ValidateDataSourceConfig(ctx, r)
628628
if err != nil {
629-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
629+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
630630
return nil, err
631631
}
632632
logging.ProtocolTrace(ctx, "Called downstream")
633633
ret, err := toproto.ValidateDataSourceConfig_Response(resp)
634634
if err != nil {
635-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
635+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
636636
return nil, err
637637
}
638638
return ret, nil
@@ -648,22 +648,22 @@ func (s *server) ReadDataSource(ctx context.Context, req *tfplugin5.ReadDataSour
648648
defer logging.ProtocolTrace(ctx, "Served request")
649649
r, err := fromproto.ReadDataSourceRequest(req)
650650
if err != nil {
651-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
651+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
652652
return nil, err
653653
}
654654
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Request", "Config", r.Config)
655655
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Request", "ProviderMeta", r.ProviderMeta)
656656
logging.ProtocolTrace(ctx, "Calling downstream")
657657
resp, err := s.downstream.ReadDataSource(ctx, r)
658658
if err != nil {
659-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
659+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
660660
return nil, err
661661
}
662662
logging.ProtocolTrace(ctx, "Called downstream")
663663
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Response", "State", resp.State)
664664
ret, err := toproto.ReadDataSource_Response(resp)
665665
if err != nil {
666-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
666+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
667667
return nil, err
668668
}
669669
return ret, nil
@@ -679,20 +679,20 @@ func (s *server) ValidateResourceTypeConfig(ctx context.Context, req *tfplugin5.
679679
defer logging.ProtocolTrace(ctx, "Served request")
680680
r, err := fromproto.ValidateResourceTypeConfigRequest(req)
681681
if err != nil {
682-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
682+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
683683
return nil, err
684684
}
685685
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Request", "Config", r.Config)
686686
logging.ProtocolTrace(ctx, "Calling downstream")
687687
resp, err := s.downstream.ValidateResourceTypeConfig(ctx, r)
688688
if err != nil {
689-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
689+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
690690
return nil, err
691691
}
692692
logging.ProtocolTrace(ctx, "Called downstream")
693693
ret, err := toproto.ValidateResourceTypeConfig_Response(resp)
694694
if err != nil {
695-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
695+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
696696
return nil, err
697697
}
698698
return ret, nil
@@ -708,20 +708,20 @@ func (s *server) UpgradeResourceState(ctx context.Context, req *tfplugin5.Upgrad
708708
defer logging.ProtocolTrace(ctx, "Served request")
709709
r, err := fromproto.UpgradeResourceStateRequest(req)
710710
if err != nil {
711-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
711+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
712712
return nil, err
713713
}
714714
logging.ProtocolTrace(ctx, "Calling downstream")
715715
resp, err := s.downstream.UpgradeResourceState(ctx, r)
716716
if err != nil {
717-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
717+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
718718
return nil, err
719719
}
720720
logging.ProtocolTrace(ctx, "Called downstream")
721721
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Response", "UpgradedState", resp.UpgradedState)
722722
ret, err := toproto.UpgradeResourceState_Response(resp)
723723
if err != nil {
724-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
724+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
725725
return nil, err
726726
}
727727
return ret, nil
@@ -737,22 +737,22 @@ func (s *server) ReadResource(ctx context.Context, req *tfplugin5.ReadResource_R
737737
defer logging.ProtocolTrace(ctx, "Served request")
738738
r, err := fromproto.ReadResourceRequest(req)
739739
if err != nil {
740-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
740+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
741741
return nil, err
742742
}
743743
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Request", "CurrentState", r.CurrentState)
744744
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Request", "ProviderMeta", r.ProviderMeta)
745745
logging.ProtocolTrace(ctx, "Calling downstream")
746746
resp, err := s.downstream.ReadResource(ctx, r)
747747
if err != nil {
748-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
748+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
749749
return nil, err
750750
}
751751
logging.ProtocolTrace(ctx, "Called downstream")
752752
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Response", "NewState", resp.NewState)
753753
ret, err := toproto.ReadResource_Response(resp)
754754
if err != nil {
755-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
755+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
756756
return nil, err
757757
}
758758
return ret, nil
@@ -768,7 +768,7 @@ func (s *server) PlanResourceChange(ctx context.Context, req *tfplugin5.PlanReso
768768
defer logging.ProtocolTrace(ctx, "Served request")
769769
r, err := fromproto.PlanResourceChangeRequest(req)
770770
if err != nil {
771-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
771+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
772772
return nil, err
773773
}
774774
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Request", "Config", r.Config)
@@ -778,14 +778,14 @@ func (s *server) PlanResourceChange(ctx context.Context, req *tfplugin5.PlanReso
778778
logging.ProtocolTrace(ctx, "Calling downstream")
779779
resp, err := s.downstream.PlanResourceChange(ctx, r)
780780
if err != nil {
781-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
781+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
782782
return nil, err
783783
}
784784
logging.ProtocolTrace(ctx, "Called downstream")
785785
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Response", "PlannedState", resp.PlannedState)
786786
ret, err := toproto.PlanResourceChange_Response(resp)
787787
if err != nil {
788-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
788+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
789789
return nil, err
790790
}
791791
return ret, nil
@@ -801,7 +801,7 @@ func (s *server) ApplyResourceChange(ctx context.Context, req *tfplugin5.ApplyRe
801801
defer logging.ProtocolTrace(ctx, "Served request")
802802
r, err := fromproto.ApplyResourceChangeRequest(req)
803803
if err != nil {
804-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
804+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
805805
return nil, err
806806
}
807807
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Request", "Config", r.Config)
@@ -811,14 +811,14 @@ func (s *server) ApplyResourceChange(ctx context.Context, req *tfplugin5.ApplyRe
811811
logging.ProtocolTrace(ctx, "Calling downstream")
812812
resp, err := s.downstream.ApplyResourceChange(ctx, r)
813813
if err != nil {
814-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
814+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
815815
return nil, err
816816
}
817817
logging.ProtocolTrace(ctx, "Called downstream")
818818
logging.ProtocolData(ctx, s.protocolDataDir, rpc, "Response", "NewState", resp.NewState)
819819
ret, err := toproto.ApplyResourceChange_Response(resp)
820820
if err != nil {
821-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
821+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
822822
return nil, err
823823
}
824824
return ret, nil
@@ -834,13 +834,13 @@ func (s *server) ImportResourceState(ctx context.Context, req *tfplugin5.ImportR
834834
defer logging.ProtocolTrace(ctx, "Served request")
835835
r, err := fromproto.ImportResourceStateRequest(req)
836836
if err != nil {
837-
logging.ProtocolError(ctx, "Error converting request from protobuf", "error", err)
837+
logging.ProtocolError(ctx, "Error converting request from protobuf", map[string]interface{}{logging.KeyError: err})
838838
return nil, err
839839
}
840840
logging.ProtocolTrace(ctx, "Calling downstream")
841841
resp, err := s.downstream.ImportResourceState(ctx, r)
842842
if err != nil {
843-
logging.ProtocolError(ctx, "Error from downstream", "error", err)
843+
logging.ProtocolError(ctx, "Error from downstream", map[string]interface{}{logging.KeyError: err})
844844
return nil, err
845845
}
846846
logging.ProtocolTrace(ctx, "Called downstream")
@@ -849,7 +849,7 @@ func (s *server) ImportResourceState(ctx context.Context, req *tfplugin5.ImportR
849849
}
850850
ret, err := toproto.ImportResourceState_Response(resp)
851851
if err != nil {
852-
logging.ProtocolError(ctx, "Error converting response to protobuf", "error", err)
852+
logging.ProtocolError(ctx, "Error converting response to protobuf", map[string]interface{}{logging.KeyError: err})
853853
return nil, err
854854
}
855855
return ret, nil

0 commit comments

Comments
 (0)