Skip to content

Commit 088de53

Browse files
[8.18] (backport #8764) Bump up github.com/go-viper/mapstructure/v2 dependency (#8803)
* Bump up github.com/go-viper/mapstructure/v2 dependency (#8764) * Bump up github.com/go-viper/mapstructure/v2 dependency * Update unit tests * Update unit tests (cherry picked from commit 676e18d) # Conflicts: # NOTICE-fips.txt # go.mod # internal/pkg/otel/run_nofips_test.go * 8.18 is not FIPS-capable * Fixing conflicts --------- Co-authored-by: Shaunak Kashyap <[email protected]>
1 parent e5cc0ce commit 088de53

File tree

6 files changed

+27
-13
lines changed

6 files changed

+27
-13
lines changed

NOTICE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3189,11 +3189,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31893189

31903190
--------------------------------------------------------------------------------
31913191
Dependency : github.com/go-viper/mapstructure/v2
3192-
Version: v2.2.1
3192+
Version: v2.3.0
31933193
Licence type (autodetected): MIT
31943194
--------------------------------------------------------------------------------
31953195

3196-
Contents of probable licence file $GOMODCACHE/github.com/go-viper/mapstructure/v2@v2.2.1/LICENSE:
3196+
Contents of probable licence file $GOMODCACHE/github.com/go-viper/mapstructure/v2@v2.3.0/LICENSE:
31973197

31983198
The MIT License (MIT)
31993199

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.4.1
3232
github.com/fatih/color v1.18.0
3333
github.com/fsnotify/fsnotify v1.8.0
34-
github.com/go-viper/mapstructure/v2 v2.2.1
34+
github.com/go-viper/mapstructure/v2 v2.3.0
3535
github.com/gofrs/flock v0.12.1
3636
github.com/gofrs/uuid/v5 v5.2.0
3737
github.com/google/go-cmp v0.7.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,8 +643,8 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
643643
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
644644
github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
645645
github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
646-
github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
647-
github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
646+
github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
647+
github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
648648
github.com/go-zookeeper/zk v1.0.4 h1:DPzxraQx7OrPyXq2phlGlNSIyWEsAox0RJmjTseMV6I=
649649
github.com/go-zookeeper/zk v1.0.4/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
650650
github.com/gobuffalo/logger v1.0.6 h1:nnZNpxYo0zx+Aj9RfMPBm+x9zAU2OayFh/xrAWi34HU=

internal/pkg/otel/run_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestStartCollector(t *testing.T) {
3030
},
3131
{
3232
configFile: "nonexistent-component.yml",
33-
expectedErrorMessage: `error decoding 'extensions': unknown type: "zpages"`,
33+
expectedErrorMessage: `'extensions' unknown type: "zpages"`,
3434
},
3535
}
3636

pkg/component/component_test.go

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package component
66

77
import (
8-
"errors"
8+
"encoding/json"
99
"fmt"
1010
"os"
1111
"path/filepath"
@@ -16,15 +16,14 @@ import (
1616
"testing"
1717
"time"
1818

19-
"github.com/elastic/go-ucfg"
20-
2119
"github.com/elastic/elastic-agent-client/v7/pkg/client"
2220
"github.com/elastic/elastic-agent-client/v7/pkg/proto"
2321
"github.com/elastic/elastic-agent-libs/logp"
24-
2522
"github.com/elastic/elastic-agent/internal/pkg/agent/transpiler"
2623
"github.com/elastic/elastic-agent/internal/pkg/eql"
24+
"github.com/elastic/go-ucfg"
2725

26+
"github.com/go-viper/mapstructure/v2"
2827
"github.com/google/go-cmp/cmp"
2928
"github.com/google/go-cmp/cmp/cmpopts"
3029
"google.golang.org/protobuf/types/known/structpb"
@@ -659,7 +658,7 @@ func TestToComponents(t *testing.T) {
659658
ID: "filestream-default-filestream-1",
660659
Type: client.UnitTypeInput,
661660
LogLevel: defaultUnitLogLevel,
662-
Err: fmt.Errorf("decoding error: %w", fmt.Errorf("decoding failed due to the following error(s):\n\n%w", errors.Join(errors.New("'meta' expected a map, got 'slice'")))),
661+
Err: fmt.Errorf("decoding error: %w", makeMapStructureErr(t)),
663662
},
664663
},
665664
},
@@ -747,7 +746,7 @@ func TestToComponents(t *testing.T) {
747746
ID: "cloudbeat-default-cloudbeat-1-unit",
748747
Type: client.UnitTypeInput,
749748
LogLevel: defaultUnitLogLevel,
750-
Err: fmt.Errorf("decoding error: %w", fmt.Errorf("decoding failed due to the following error(s):\n\n%w", errors.Join(errors.New("'meta' expected a map, got 'slice'")))),
749+
Err: fmt.Errorf("decoding error: %w", makeMapStructureErr(t)),
751750
},
752751
},
753752
},
@@ -2945,3 +2944,18 @@ func TestFlattenedDataStreamIsolatedUnits(t *testing.T) {
29452944
}
29462945
}
29472946
}
2947+
2948+
func makeMapStructureErr(t *testing.T) error {
2949+
t.Helper()
2950+
2951+
jsonStr := `{ "meta": [] }`
2952+
2953+
var data map[string]interface{}
2954+
err := json.Unmarshal([]byte(jsonStr), &data)
2955+
require.NoError(t, err)
2956+
2957+
var output struct {
2958+
Meta struct{} `mapstructure:"meta"`
2959+
}
2960+
return mapstructure.Decode(data, &output)
2961+
}

pkg/component/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func TestExpectedConfig(t *testing.T) {
183183
},
184184
},
185185
},
186-
Err: errors.New("decoding error: decoding failed due to the following error(s):\n\n'meta' expected a map, got 'slice'"),
186+
Err: errors.New("decoding error: decoding failed due to the following error(s):\n\n'meta' expected a map or struct, got \"slice\""),
187187
},
188188
}
189189

0 commit comments

Comments
 (0)