This is an automated email from the ASF dual-hosted git repository.
mattjackson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 658b63e Fix panic and wording (#6070)
658b63e is described below
commit 658b63e76a90d41f0bb6a862475deb208b2d2f09
Author: Steve Hamrick <[email protected]>
AuthorDate: Wed Aug 4 15:44:07 2021 -0600
Fix panic and wording (#6070)
---
docs/source/development/traffic_ops.rst | 4 ++--
traffic_ops/app/db/traffic_vault_migrate/postgres.go | 3 +++
.../app/db/traffic_vault_migrate/traffic_vault_migrate.go | 11 +++++++++--
.../traffic_vault_migrate/traffic_vault_migrate_test.go | 15 +++++++++++----
4 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/docs/source/development/traffic_ops.rst
b/docs/source/development/traffic_ops.rst
index ed2486d..a276f8c 100644
--- a/docs/source/development/traffic_ops.rst
+++ b/docs/source/development/traffic_ops.rst
@@ -340,7 +340,7 @@ Usage
.. option:: -i DIR, --fill DIR
- Insert data into `to` server with data this directory
+ Insert data into `to` server with data in this directory
.. note:: Mutually exclusive with :option:`-d`/:option:`--dump`
@@ -356,7 +356,7 @@ Usage
.. option:: -m, --noConfirm
- Do not require confirmation before inserting records
+ Don't require confirmation before inserting records
.. option:: -r, --dry
diff --git a/traffic_ops/app/db/traffic_vault_migrate/postgres.go
b/traffic_ops/app/db/traffic_vault_migrate/postgres.go
index 1c5c1b1..0cae23c 100644
--- a/traffic_ops/app/db/traffic_vault_migrate/postgres.go
+++ b/traffic_ops/app/db/traffic_vault_migrate/postgres.go
@@ -701,6 +701,9 @@ func decryptInto(aesKey []byte, encData []byte, value
interface{}) error {
return nil
}
func insertIntoTable(db *sql.DB, queryBase string, stride int, queryArgs
[]interface{}) error {
+ if len(queryArgs) == 0 {
+ return nil
+ }
rows := len(queryArgs) / stride
workStr := ""
queryValueStr := make([]string, rows)
diff --git a/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate.go
b/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate.go
index 60d0a6a..d53050e 100644
--- a/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate.go
+++ b/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate.go
@@ -83,7 +83,7 @@ func init() {
SetFlag().
SetGroup("no_insert")
- getopt.FlagLong(&noConfirm, "noConfirm", 'm', "Requires confirmation
before inserting records").
+ getopt.FlagLong(&noConfirm, "noConfirm", 'm', "Don't require
confirmation before inserting records").
SetFlag()
getopt.FlagLong(&dump, "dump", 'd', "Write keys (from 'from' server) to
disk").
@@ -91,7 +91,7 @@ func init() {
SetGroup("disk_bck").
SetFlag()
- getopt.FlagLong(&keyFile, "fill", 'i', "Insert data into `to` server
with data this directory").
+ getopt.FlagLong(&keyFile, "fill", 'i', "Insert data into `to` server
with data in this directory").
SetOptional().
SetGroup("disk_bck")
@@ -572,6 +572,13 @@ func initConfig() {
}
cfg = newCfg
} else if logLevel != "" {
+ cfg = config{
+ LogLocationError: log.LogLocationNull,
+ LogLocationWarning: log.LogLocationNull,
+ LogLocationInfo: log.LogLocationNull,
+ LogLocationDebug: log.LogLocationNull,
+ LogLocationEvent: log.LogLocationNull,
+ }
switch logLevel {
case "event":
cfg.LogLocationEvent = log.LogLocationStdout
diff --git
a/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate_test.go
b/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate_test.go
index 49c468c..d9ac84e 100644
--- a/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate_test.go
+++ b/traffic_ops/app/db/traffic_vault_migrate/traffic_vault_migrate_test.go
@@ -20,14 +20,16 @@ package main
*/
import (
- "github.com/apache/trafficcontrol/lib/go-tc"
- "github.com/apache/trafficcontrol/lib/go-util"
- "github.com/lestrrat/go-jwx/jwk"
"math/rand"
"reflect"
"strconv"
"strings"
"testing"
+
+ "github.com/lestrrat/go-jwx/jwk"
+
+ "github.com/apache/trafficcontrol/lib/go-tc"
+ "github.com/apache/trafficcontrol/lib/go-util"
)
func testBackend(t *testing.T, backend TVBackend) {
@@ -37,13 +39,14 @@ func testBackend(t *testing.T, backend TVBackend) {
DeliveryService: "demo1",
Hostname: "*.demo1.mycdn.ciab.test",
Key: "demo1",
- Version: 0,
+ Version: 1,
Certificate: tc.DeliveryServiceSSLKeysCertificate{
Crt:
"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUhBRENDQk9pZ0F3SUJBZ0lGRmhGWklab3dEUVlKS29aSWh2Y05BUUVMQlFBd2dhOHhDekFKQmdOVkJBWVQKQWxWVE1SRXdEd1lEVlFRSUV3aERiMnh2Y21Ga2J6RVBNQTBHQTFVRUJ4TUdSR1Z1ZG1WeU1SVXdFd1lEVlFRSwpFd3hEUkU0dGFXNHRZUzFDYjNneEZUQVRCZ05WQkFzVERFTkVUaTFwYmkxaExVSnZlREVsTUNNR0ExVUVBeE1jClEwUk9MV2x1TFdFdFFtOTRJRWx1ZEdWeWJXVmthV0YwWlNCRFFURW5NQ1VHQ1NxR1NJYjNEUUVKQVJZWWJtOHQKY21Wd2JIbEFhVzVtY21FdVkybGhZaTUwWlhOME1CNFhEVEl4TURFeU5URTJNekF3TWxvWERUSXlNREV5TlRFMgpNekF3TWxvd2
[...]
Key:
"LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRd0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1Mwd2dna3BBZ0VBQW9JQ0FRQ3RKK2pxakUxeVV2YlkKa0RaV2t4RUY2WWhVelcrdmM0TzFHRmgrS2pQalJySlFWNnQ3ckVkaERTZGJZeG4xcjFlMStBWUNZd0pabUpTaQpUTU4yY000anJOdUd5TUsybVpqUkErVlIrd1JBeUJjR0VUeG91cEFhcitvTHo3TUg2OU4xVnpzWmJqTFZjVjZDClh4ODFyMkV6emd5UkJjQVlTdElxY29rbnc3eXNYdXRNaDNDSSs2OXNGZXBQeUZoblRaMjBXNFhabFRicnZ5YTgKbUkvb0R3T0ZVaVhJM0dtRTN1TGdEY3F5SVQySThHSzFnK29xcnA0Si93RDhCaGNSV1VOdG50ZWwwN0d1dVJkZApySWl0SGRjVV
[...]
CSR:
"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0KTUlJRXJ6Q0NBcGNDQVFBd2FqRUxNQWtHQTFVRUJoTUNWVk14RVRBUEJnTlZCQWdNQ0VOdmJHOXlZV1J2TVE4dwpEUVlEVlFRSERBWkVaVzUyWlhJeEZUQVRCZ05WQkFvTURFTkVUaTFwYmkxaExVSnZlREVnTUI0R0ExVUVBd3dYCktpNWtaVzF2TVM1dGVXTmtiaTVqYVdGaUxuUmxjM1F3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXcKZ2dJS0FvSUNBUUN0SitqcWpFMXlVdmJZa0RaV2t4RUY2WWhVelcrdmM0TzFHRmgrS2pQalJySlFWNnQ3ckVkaApEU2RiWXhuMXIxZTErQVlDWXdKWm1KU2lUTU4yY000anJOdUd5TUsybVpqUkErVlIrd1JBeUJjR0VUeG91cEFhCn
[...]
},
},
+ Version: "1",
}
uri := URISignKey{
DeliveryService: "defaultDS2",
@@ -195,4 +198,8 @@ func TestPGBackend(t *testing.T) {
},
}
testBackend(t, &pg)
+
+ if err := insertIntoTable(nil, "TEST", 1, make([]interface{}, 0)); err
!= nil {
+ t.Fatal(err)
+ }
}
