Skip to content

Commit

Permalink
Use imported sdk/helper/stepwise over vault-testing-stepwise
Browse files Browse the repository at this point in the history
Note that this package is in the SDK so it remains importable by
third-party plugins wishing to test against our instance.

However, this allows it to be maintained alongside our distribution and
is one fewer external dependency to maintain.

Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com>
  • Loading branch information
cipherboy committed Jan 23, 2024
1 parent 23148c5 commit 34c0163
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 251 deletions.
4 changes: 2 additions & 2 deletions builtin/credential/userpass/stepwise_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"reflect"
"testing"

stepwise "github.com/hashicorp/vault-testing-stepwise"
dockerEnvironment "github.com/hashicorp/vault-testing-stepwise/environments/docker"
"github.com/mitchellh/mapstructure"
"github.com/openbao/openbao/api"
"github.com/openbao/openbao/sdk/helper/policyutil"
"github.com/openbao/openbao/sdk/helper/stepwise"
dockerEnvironment "github.com/openbao/openbao/sdk/helper/stepwise/environments/docker"
)

func TestAccBackend_stepwise_UserCrud(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions builtin/logical/transit/stepwise_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"os"
"testing"

stepwise "github.com/hashicorp/vault-testing-stepwise"
dockerEnvironment "github.com/hashicorp/vault-testing-stepwise/environments/docker"
"github.com/mitchellh/mapstructure"
"github.com/openbao/openbao/api"
"github.com/openbao/openbao/sdk/helper/keysutil"
"github.com/openbao/openbao/sdk/helper/stepwise"
dockerEnvironment "github.com/openbao/openbao/sdk/helper/stepwise/environments/docker"
)

// TestBackend_basic_docker is an example test using the Docker Environment
Expand Down
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ require (
github.com/hashicorp/raft-snapshot v1.0.4
github.com/hashicorp/vault-plugin-mock v0.16.1
github.com/hashicorp/vault-plugin-secrets-kubernetes v0.5.0
github.com/hashicorp/vault-testing-stepwise v0.1.3
github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab
github.com/jackc/pgx/v4 v4.18.1
github.com/jcmturner/gokrb5/v8 v8.4.4
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -670,8 +670,6 @@ github.com/hashicorp/vault-plugin-mock v0.16.1 h1:5QQvSUHxDjEEbrd2REOeacqyJnCLPD
github.com/hashicorp/vault-plugin-mock v0.16.1/go.mod h1:83G4JKlOwUtxVourn5euQfze3ZWyXcUiLj2wqrKSDIM=
github.com/hashicorp/vault-plugin-secrets-kubernetes v0.5.0 h1:g0W1ybHjO945jDtuDEFcqTINyW/s06wxZarE/7aLumc=
github.com/hashicorp/vault-plugin-secrets-kubernetes v0.5.0/go.mod h1:2wobeIypBESGQYmhv12vuAorCvfETHpBoMyrb+6QTmQ=
github.com/hashicorp/vault-testing-stepwise v0.1.3 h1:GYvm98EB4nUKUntkBcLicnKsebeV89KPHmAGJUCPU/c=
github.com/hashicorp/vault-testing-stepwise v0.1.3/go.mod h1:Ym1T/kMM2sT6qgCIIJ3an7uaSWCJ8O7ohsWB9UiB5tI=
github.com/hashicorp/vault/api v1.9.2 h1:YjkZLJ7K3inKgMZ0wzCU9OHqc+UqMQyXsPXnf3Cl2as=
github.com/hashicorp/vault/api v1.9.2/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
github.com/hashicorp/vault/api/auth/kubernetes v0.4.1 h1:amFWL1ZhwMWdmqvT51J9phXu835kY25wFfTrY/3yXd0=
Expand Down
2 changes: 1 addition & 1 deletion sdk/helper/stepwise/environments/docker/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"github.com/hashicorp/go-cleanhttp"
"github.com/hashicorp/go-multierror"
uuid "github.com/hashicorp/go-uuid"
stepwise "github.com/hashicorp/vault-testing-stepwise"
"github.com/openbao/openbao/api"
"github.com/openbao/openbao/sdk/helper/stepwise"
"golang.org/x/net/http2"
)

Expand Down
60 changes: 0 additions & 60 deletions sdk/helper/stepwise/go.mod

This file was deleted.

Loading

0 comments on commit 34c0163

Please sign in to comment.