merging from other branch

go.mod

@@ -94,7 +94,7 @@ require (
 	github.com/jefferai/jsonx v1.0.0
 	github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f
 	github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f
-	github.com/kr/pretty v0.1.0
+	github.com/kr/pretty v0.2.0
 	github.com/kr/text v0.1.0
 	github.com/lib/pq v1.2.0
 	github.com/mattn/go-colorable v0.1.4

go.sum

@@ -140,6 +140,8 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
+github.com/containerd/containerd v1.3.4 h1:3o0smo5SKY7H6AJCmJhsnCjR2/V2T8VmiHt7seN2/kI=
+github.com/containerd/containerd v1.3.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -174,6 +176,10 @@ github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TR
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
 github.com/dnaeon/go-vcr v1.0.1 h1:r8L/HqC0Hje5AXMu1ooW8oyQyOFv4GxqpL0nRP7SLLY=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
+github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
+github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182 h1:Caj/qGJ9KyulC1WSksyPgp7r8+DKgTGfU39lmb2C5MQ=
+github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -522,6 +528,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -765,6 +773,8 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMx
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/y0ssar1an/q v1.0.10 h1:ZDk1A2iVD9ADpAIshUrZC5LXz0IrFi8ynZFpd79r3K0=
+github.com/y0ssar1an/q v1.0.10/go.mod h1:WSOB4gz+fGjO4MYSCuxDK6KS7L5XFjFf8KrQi4srPG4=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=

sdk/testing/stepwise/testing.go

@@ -208,30 +208,35 @@ func Run(tt TestT, c Case) {
 			logger.Warn("Executing test step", "step_number", i+1)
 		}
 
-		// Create the request
-		req := &logical.Request{
-			// Operation: s.Operation,
-			// Path:      s.Path,
-			// Data:      s.Data,
-		}
+		// // Create the request
+		// req := &logical.Request{
+		// 	// Operation: s.Operation,
+		// 	// Path:      s.Path,
+		// 	// Data:      s.Data,
+		// }
 
 		// TODO hard coded path here, need mount point. Will it be dynamic? probabaly
 		// needs to be
 		path := fmt.Sprintf("transit/%s", s.Path)
 		var err error
 		var resp *api.Secret
+		client, cerr := c.Driver.Client()
+		if cerr != nil {
+			tt.Fatal(cerr)
+		}
 		// TODO should check expect none here?
-		var lr *logical.Response
+		// var lr *logical.Response
 		switch s.Operation {
-		case logical.CreateOperation, logical.UpdateOperation:
+		case WriteOperation, UpdateOperation:
 			resp, err = client.Logical().Write(path, s.Data)
-		case logical.ReadOperation:
+		case ReadOperation:
+			// resp, err = client.Logical().ReadWithData(path, s.Data)
 			resp, err = client.Logical().Read(path)
-		case logical.ListOperation:
+		case ListOperation:
 			resp, err = client.Logical().List(path)
 			// TODO why though
-			lr = &logical.Response{}
-		case logical.DeleteOperation:
+			// lr = &logical.Response{}
+		case DeleteOperation:
 			resp, err = client.Logical().Delete(path)
 		default:
 			panic("bad operation")
@@ -262,7 +267,7 @@ func Run(tt TestT, c Case) {
 		// }
 
 		// Make sure to prefix the path with where we mounted the thing
-		req.Path = fmt.Sprintf("%s/%s", prefix, req.Path)
+		// req.Path = fmt.Sprintf("%s/%s", prefix, req.Path)
 
 		if isAuthBackend {
 			// Prepend the path with "auth"
@@ -289,13 +294,13 @@ func Run(tt TestT, c Case) {
 			// regardless of whether the error is a 'logical.ErrorResponse'
 			// or not. Set the err to nil. If the error is a logical.ErrorResponse,
 			// it will be handled later.
-			// if s.ErrorOk {
-			// 	// err = nil
-			// } else {
-			// 	// // If the error is not expected, fail right away.
-			// 	// tt.Error(fmt.Sprintf("Failed step %d: %s", i+1, err))
-			// 	// break
-			// }
+			if s.ErrorOk {
+				// err = nil
+			} else {
+				// // If the error is not expected, fail right away.
+				// tt.Error(fmt.Sprintf("Failed step %d: %s", i+1, err))
+				// break
+			}
 		}
 
 		// If the error is a 'logical.ErrorResponse' and if error was not expected,
@@ -327,6 +332,7 @@ func Run(tt TestT, c Case) {
 		}
 	}
 
+	// TODO
 	// TODO
 	// - Revoking things here
 	//