From 5ed56fc786a3f68bf9863eaa422d06e6606f1a4d Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Mon, 12 Jul 2021 10:37:25 -0400 Subject: [PATCH] check error when `raftApplyMsgpack` --- agent/connect/ca/provider_aws.go | 3 +-- agent/consul/leader_connect_ca.go | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/agent/connect/ca/provider_aws.go b/agent/connect/ca/provider_aws.go index 73edc95f8c7f..e03f35984daa 100644 --- a/agent/connect/ca/provider_aws.go +++ b/agent/connect/ca/provider_aws.go @@ -12,9 +12,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/acmpca" - "github.com/mitchellh/mapstructure" - "github.com/hashicorp/go-hclog" + "github.com/mitchellh/mapstructure" "github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/agent/structs" diff --git a/agent/consul/leader_connect_ca.go b/agent/consul/leader_connect_ca.go index cb646dfe1e7c..9a6f73631cb2 100644 --- a/agent/consul/leader_connect_ca.go +++ b/agent/consul/leader_connect_ca.go @@ -105,6 +105,9 @@ func (c *caDelegateWithState) ApplyCALeafRequest() (uint64, error) { Datacenter: c.Server.config.Datacenter, } resp, err := c.Server.raftApplyMsgpack(structs.ConnectCALeafRequestType|structs.IgnoreUnknownTypeFlag, &req) + if err != nil { + return 0, err + } modIdx, ok := resp.(uint64) if !ok {