From 6bfdc3866257501beb121951d87812648a3abd30 Mon Sep 17 00:00:00 2001 From: Christoph Mewes Date: Mon, 4 Nov 2024 20:21:25 +0100 Subject: [PATCH] replace ajeddeloh/go-json with coreos/go-json --- config/util/parsingErrors.go | 2 +- config/v1/config.go | 2 +- config/v2_0/config.go | 4 ++-- config/v2_1/config.go | 2 +- config/v2_2/config.go | 2 +- config/v2_3/config.go | 2 +- config/v2_4/config.go | 2 +- config/validate/astjson/node.go | 2 +- config/validate/validate.go | 2 +- config/validate/validate_test.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config/util/parsingErrors.go b/config/util/parsingErrors.go index 170f20fe..30503c3e 100644 --- a/config/util/parsingErrors.go +++ b/config/util/parsingErrors.go @@ -22,7 +22,7 @@ import ( "github.com/flatcar/ignition/config/v2_4/types" "github.com/flatcar/ignition/config/validate/report" - json "github.com/ajeddeloh/go-json" + json "github.com/coreos/go-json" "go4.org/errorutil" ) diff --git a/config/v1/config.go b/config/v1/config.go index 95803050..3767df94 100644 --- a/config/v1/config.go +++ b/config/v1/config.go @@ -21,7 +21,7 @@ import ( "github.com/flatcar/ignition/config/validate" "github.com/flatcar/ignition/config/validate/report" - json "github.com/ajeddeloh/go-json" + json "github.com/coreos/go-json" ) func Parse(rawConfig []byte) (types.Config, report.Report, error) { diff --git a/config/v2_0/config.go b/config/v2_0/config.go index dcb8e7bd..19b0f841 100644 --- a/config/v2_0/config.go +++ b/config/v2_0/config.go @@ -16,12 +16,12 @@ package v2_0 import ( "github.com/flatcar/ignition/config/shared/errors" - "github.com/flatcar/ignition/config/v1" + v1 "github.com/flatcar/ignition/config/v1" "github.com/flatcar/ignition/config/v2_0/types" "github.com/flatcar/ignition/config/validate" "github.com/flatcar/ignition/config/validate/report" - json "github.com/ajeddeloh/go-json" + json "github.com/coreos/go-json" "github.com/coreos/go-semver/semver" ) diff --git a/config/v2_1/config.go b/config/v2_1/config.go index cf12fe79..5b8e3139 100644 --- a/config/v2_1/config.go +++ b/config/v2_1/config.go @@ -22,7 +22,7 @@ import ( "github.com/flatcar/ignition/config/validate" "github.com/flatcar/ignition/config/validate/report" - json "github.com/ajeddeloh/go-json" + json "github.com/coreos/go-json" ) func Parse(rawConfig []byte) (types.Config, report.Report, error) { diff --git a/config/v2_2/config.go b/config/v2_2/config.go index 7df84501..82d84d0a 100644 --- a/config/v2_2/config.go +++ b/config/v2_2/config.go @@ -21,7 +21,7 @@ import ( "github.com/flatcar/ignition/config/validate" "github.com/flatcar/ignition/config/validate/report" - json "github.com/ajeddeloh/go-json" + json "github.com/coreos/go-json" "github.com/coreos/go-semver/semver" ) diff --git a/config/v2_3/config.go b/config/v2_3/config.go index 4693547a..0aef5115 100644 --- a/config/v2_3/config.go +++ b/config/v2_3/config.go @@ -21,7 +21,7 @@ import ( "github.com/flatcar/ignition/config/validate" "github.com/flatcar/ignition/config/validate/report" - json "github.com/ajeddeloh/go-json" + json "github.com/coreos/go-json" "github.com/coreos/go-semver/semver" ) diff --git a/config/v2_4/config.go b/config/v2_4/config.go index e6120bda..680a618f 100644 --- a/config/v2_4/config.go +++ b/config/v2_4/config.go @@ -21,7 +21,7 @@ import ( "github.com/flatcar/ignition/config/validate" "github.com/flatcar/ignition/config/validate/report" - json "github.com/ajeddeloh/go-json" + json "github.com/coreos/go-json" "github.com/coreos/go-semver/semver" ) diff --git a/config/validate/astjson/node.go b/config/validate/astjson/node.go index 9875cfde..95b8ab08 100644 --- a/config/validate/astjson/node.go +++ b/config/validate/astjson/node.go @@ -17,7 +17,7 @@ package astjson import ( "io" - json "github.com/ajeddeloh/go-json" + json "github.com/coreos/go-json" "github.com/flatcar/ignition/config/validate/astnode" "go4.org/errorutil" ) diff --git a/config/validate/validate.go b/config/validate/validate.go index 3363f8db..4c3cca1a 100644 --- a/config/validate/validate.go +++ b/config/validate/validate.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - json "github.com/ajeddeloh/go-json" + json "github.com/coreos/go-json" "github.com/flatcar/ignition/config/validate/astjson" "github.com/flatcar/ignition/config/validate/astnode" "github.com/flatcar/ignition/config/validate/report" diff --git a/config/validate/validate_test.go b/config/validate/validate_test.go index b29c085c..8fbb0c08 100644 --- a/config/validate/validate_test.go +++ b/config/validate/validate_test.go @@ -23,7 +23,7 @@ import ( "github.com/coreos/go-semver/semver" "github.com/stretchr/testify/assert" - json "github.com/ajeddeloh/go-json" + json "github.com/coreos/go-json" "github.com/flatcar/ignition/config/shared/errors" "github.com/flatcar/ignition/config/util" "github.com/flatcar/ignition/config/validate/astjson" diff --git a/go.mod b/go.mod index 226d88da..9318c566 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/flatcar/ignition go 1.16 require ( - github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 github.com/aws/aws-sdk-go v1.8.39 + github.com/coreos/go-json v0.0.0-20231102161613-e49c8866685a github.com/coreos/go-semver v0.1.0 github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 github.com/go-ini/ini v1.25.4 // indirect diff --git a/go.sum b/go.sum index f2318143..9e22ae21 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 h1:gZCtZ+Hh/e3CGEX8q/yAcp8wWu5ZS6NMk6VGzpQhI3s= -github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437/go.mod h1:otnto4/Icqn88WCcM4bhIJNSgsh9VLBuspyyCfvof9c= github.com/aws/aws-sdk-go v1.8.39 h1:YUHeSL8ksAt063XvBxH94mIPHd0bh+dbyQR141Hb9e0= github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= +github.com/coreos/go-json v0.0.0-20231102161613-e49c8866685a h1:QimUZQ6Au5wFKKkPMmdoXen+CNR66lXt/76AQLBltS0= +github.com/coreos/go-json v0.0.0-20231102161613-e49c8866685a/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw= github.com/coreos/go-semver v0.1.0 h1:/7eIWhjNpsljQCSU+5NaZzu7HmMvoWnMqOmNZljz1f0= github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 h1:3jFq2xL4ZajGK4aZY8jz+DAF0FHjI51BXjjSwCzS1Dk=