chore: run go generate ./... (#1343)

The https://github.com/iancoleman/strcase library changed its default behavior between v0.2.0 and v0.3.0 such that: - before `DNS_NXDOMAIN_error` became `DNSNXDOMAINError`; - now it becomes `DnsNxdomainError`. In the grand scheme of things, perhaps, this change makes sense for the library. However, as a user, what I see is a breaking change between two minor versions (admittedly we're at v0.x). Because I don't know what would happen next and I don't want any more surprises, I am forking strcase@v2.0.0. This work is part of ooni/probe#2524
ooni · Oct 4, 2023 · b52b963 · b52b963
1 parent e28b9e0
commit b52b963
Show file tree

Hide file tree

Showing 22 changed files with 818 additions and 71 deletions.
diff --git a/go.mod b/go.mod
@@ -20,7 +20,6 @@ require (
  github.com/google/uuid v1.3.1
  github.com/gorilla/websocket v1.5.0
  github.com/hexops/gotextdiff v1.0.3
- github.com/iancoleman/strcase v0.3.0
  github.com/mattn/go-colorable v0.1.13
  github.com/miekg/dns v1.1.56
  github.com/mitchellh/go-wordwrap v1.0.1

diff --git a/go.sum b/go.sum
@@ -283,8 +283,6 @@ github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
-github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
-github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=

diff --git a/internal/netxlite/certifi.go b/internal/netxlite/certifi.go
diff --git a/internal/netxlite/errno.go b/internal/netxlite/errno.go
diff --git a/internal/netxlite/errno_darwin.go b/internal/netxlite/errno_darwin.go
diff --git a/internal/netxlite/errno_darwin_test.go b/internal/netxlite/errno_darwin_test.go
diff --git a/internal/netxlite/errno_freebsd.go b/internal/netxlite/errno_freebsd.go
diff --git a/internal/netxlite/errno_freebsd_test.go b/internal/netxlite/errno_freebsd_test.go
diff --git a/internal/netxlite/errno_linux.go b/internal/netxlite/errno_linux.go
diff --git a/internal/netxlite/errno_linux_test.go b/internal/netxlite/errno_linux_test.go
diff --git a/internal/netxlite/errno_openbsd.go b/internal/netxlite/errno_openbsd.go
diff --git a/internal/netxlite/errno_openbsd_test.go b/internal/netxlite/errno_openbsd_test.go
diff --git a/internal/netxlite/errno_windows.go b/internal/netxlite/errno_windows.go
diff --git a/internal/netxlite/errno_windows_test.go b/internal/netxlite/errno_windows_test.go
diff --git a/internal/netxlite/internal/generrno/main.go b/internal/netxlite/internal/generrno/main.go
@@ -7,7 +7,7 @@ import (
  "sort"
  "time"
 
- "github.com/iancoleman/strcase"
+ "github.com/ooni/probe-cli/v3/internal/strcasex"
  "golang.org/x/sys/execabs"
 )
 
@@ -69,12 +69,12 @@ func (es *ErrorSpec) AsCanonicalErrnoName() string {
 
 // AsFailureVar returns the name of the failure var.
 func (es *ErrorSpec) AsFailureVar() string {
- return "Failure" + strcase.ToCamel(es.failure)
+ return "Failure" + strcasex.ToCamel(es.failure)
 }
 
 // AsFailureString returns the OONI failure string.
 func (es *ErrorSpec) AsFailureString() string {
- return strcase.ToSnake(es.failure)
+ return strcasex.ToSnake(es.failure)
 }
 
 // NewSystemError constructs a new ErrorSpec representing a system

diff --git a/internal/registry/factory.go b/internal/registry/factory.go
@@ -10,8 +10,8 @@ import (
  "reflect"
  "strconv"
 
- "github.com/iancoleman/strcase"
  "github.com/ooni/probe-cli/v3/internal/model"
+ "github.com/ooni/probe-cli/v3/internal/strcasex"
 )
 
 // Factory allows to construct an experiment measurer.
@@ -201,7 +201,7 @@ func (b *Factory) NewExperimentMeasurer() model.ExperimentMeasurer {
 // compatibility with MK, we need to add some exceptions here when
 // mapping (e.g., DNSCheck => dnscheck).
 func CanonicalizeExperimentName(name string) string {
- switch name = strcase.ToSnake(name); name {
+ switch name = strcasex.ToSnake(name); name {
  case "ndt_7":
  name = "ndt" // since 2020-03-18, we use ndt7 to implement ndt by default
  case "dns_check":

diff --git a/internal/strcasex/acronyms.go b/internal/strcasex/acronyms.go
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MIT
+
+package strcasex
+
+var uppercaseAcronym = map[string]string{
+ "ID": "id",
+}
+
+// ConfigureAcronym allows you to add additional words which will be considered acronyms
+func ConfigureAcronym(key, val string) {
+ uppercaseAcronym[key] = val
+}