Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run make fmt #29053

Merged
merged 1 commit into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions builtin/credential/okta/path_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ import (
"strings"
"time"

gocache "github.com/patrickmn/go-cache"

oktaold "github.com/chrismalek/oktasdk-go/okta"
"github.com/hashicorp/go-cleanhttp"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/tokenutil"
"github.com/hashicorp/vault/sdk/logical"
oktanew "github.com/okta/okta-sdk-golang/v5/okta"
gocache "github.com/patrickmn/go-cache"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/pki/issuing/cert_verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ package issuing
import (
"context"
"fmt"
"github.com/hashicorp/vault/sdk/logical"
"os"
"strconv"
"time"

ctx509 "github.com/google/certificate-transparency-go/x509"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/sdk/logical"
)

// disableVerifyCertificateEnvVar is an environment variable that can be used to disable the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ package cmd
import (
"context"

"github.com/spf13/cobra"

"github.com/hashicorp/vault/tools/pipeline/internal/pkg/generate"
"github.com/hashicorp/vault/tools/pipeline/internal/pkg/releases"
"github.com/spf13/cobra"
)

// skipVersionsDefault are versions that we skip by default. This list can grow as necessary.
Expand Down
3 changes: 1 addition & 2 deletions tools/pipeline/internal/cmd/releases_list_versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import (
"encoding/json"
"fmt"

"github.com/spf13/cobra"

"github.com/hashicorp/vault/tools/pipeline/internal/pkg/releases"
"github.com/spf13/cobra"
)

var listReleaseVersionsReq = &releases.ListVersionsReq{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ import (
"slices"

"github.com/Masterminds/semver"
slogctx "github.com/veqryn/slog-context"

"github.com/hashicorp/hcl/v2/gohcl"
"github.com/hashicorp/hcl/v2/hclwrite"
"github.com/hashicorp/vault/tools/pipeline/internal/pkg/metadata"
"github.com/hashicorp/vault/tools/pipeline/internal/pkg/releases"
slogctx "github.com/veqryn/slog-context"
)

// EnosDynamicConfigReq is a request to generate dynamic enos configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import (
"slices"
"testing"

"github.com/stretchr/testify/require"

"github.com/hashicorp/vault/tools/pipeline/internal/pkg/releases"
"github.com/stretchr/testify/require"
)

var testAPIVersions = []string{
Expand Down
3 changes: 1 addition & 2 deletions tools/pipeline/internal/pkg/releases/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
"time"

"github.com/Masterminds/semver"
slogctx "github.com/veqryn/slog-context"

"github.com/hashicorp/releases-api/pkg/api"
"github.com/hashicorp/releases-api/pkg/client"
"github.com/hashicorp/releases-api/pkg/models"
slogctx "github.com/veqryn/slog-context"
)

// Client is an api.releases.hashicorp.com API client.
Expand Down
1 change: 0 additions & 1 deletion tools/pipeline/internal/pkg/releases/client_mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"context"

"github.com/Masterminds/semver"

"github.com/hashicorp/releases-api/pkg/models"
)

Expand Down
3 changes: 1 addition & 2 deletions tools/pipeline/internal/pkg/releases/list_versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ import (
"slices"

"github.com/Masterminds/semver"
slogctx "github.com/veqryn/slog-context"

"github.com/hashicorp/vault/tools/pipeline/internal/pkg/metadata"
slogctx "github.com/veqryn/slog-context"
)

// ListVersionsReq is a request to list versions from the releases API.
Expand Down
Loading