From 610c8a4d38e044fd575bb9ba01562ed1521f61f5 Mon Sep 17 00:00:00 2001 From: Steven Clark Date: Wed, 3 Jan 2024 12:11:44 -0500 Subject: [PATCH] Move Vault's customized pkcs7 fork into a shared location (#24658) - The PKI plugin needs to use the customized pkcs7 fork so move it out from the aws credential plugin's package into a shared location --- .copywrite.hcl | 2 +- builtin/credential/aws/path_login.go | 6 +++--- {builtin/credential/aws => helper}/pkcs7/LICENSE | 0 {builtin/credential/aws => helper}/pkcs7/README.md | 0 {builtin/credential/aws => helper}/pkcs7/ber.go | 0 {builtin/credential/aws => helper}/pkcs7/ber_test.go | 0 {builtin/credential/aws => helper}/pkcs7/decrypt.go | 0 {builtin/credential/aws => helper}/pkcs7/decrypt_test.go | 0 {builtin/credential/aws => helper}/pkcs7/encrypt.go | 0 {builtin/credential/aws => helper}/pkcs7/encrypt_test.go | 0 {builtin/credential/aws => helper}/pkcs7/pkcs7.go | 0 {builtin/credential/aws => helper}/pkcs7/pkcs7_test.go | 0 {builtin/credential/aws => helper}/pkcs7/sign.go | 0 {builtin/credential/aws => helper}/pkcs7/sign_test.go | 0 {builtin/credential/aws => helper}/pkcs7/verify.go | 0 15 files changed, 4 insertions(+), 4 deletions(-) rename {builtin/credential/aws => helper}/pkcs7/LICENSE (100%) rename {builtin/credential/aws => helper}/pkcs7/README.md (100%) rename {builtin/credential/aws => helper}/pkcs7/ber.go (100%) rename {builtin/credential/aws => helper}/pkcs7/ber_test.go (100%) rename {builtin/credential/aws => helper}/pkcs7/decrypt.go (100%) rename {builtin/credential/aws => helper}/pkcs7/decrypt_test.go (100%) rename {builtin/credential/aws => helper}/pkcs7/encrypt.go (100%) rename {builtin/credential/aws => helper}/pkcs7/encrypt_test.go (100%) rename {builtin/credential/aws => helper}/pkcs7/pkcs7.go (100%) rename {builtin/credential/aws => helper}/pkcs7/pkcs7_test.go (100%) rename {builtin/credential/aws => helper}/pkcs7/sign.go (100%) rename {builtin/credential/aws => helper}/pkcs7/sign_test.go (100%) rename {builtin/credential/aws => helper}/pkcs7/verify.go (100%) diff --git a/.copywrite.hcl b/.copywrite.hcl index e310fe70a0..de148843b4 100644 --- a/.copywrite.hcl +++ b/.copywrite.hcl @@ -8,7 +8,7 @@ project { # Supports doublestar glob patterns for more flexibility in defining which # files or folders should be ignored header_ignore = [ - "builtin/credential/aws/pkcs7/**", + "helper/pkcs7/**", "ui/node_modules/**", "enos/modules/k8s_deploy_vault/raft-config.hcl", "plugins/database/postgresql/scram/**", diff --git a/builtin/credential/aws/path_login.go b/builtin/credential/aws/path_login.go index ca74344172..b66146d1ee 100644 --- a/builtin/credential/aws/path_login.go +++ b/builtin/credential/aws/path_login.go @@ -26,14 +26,14 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/aws/aws-sdk-go/service/sts" "github.com/hashicorp/errwrap" - cleanhttp "github.com/hashicorp/go-cleanhttp" + "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-retryablehttp" "github.com/hashicorp/go-secure-stdlib/awsutil" "github.com/hashicorp/go-secure-stdlib/parseutil" "github.com/hashicorp/go-secure-stdlib/strutil" - uuid "github.com/hashicorp/go-uuid" + "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/builtin/credential/aws/pkcs7" + "github.com/hashicorp/vault/helper/pkcs7" "github.com/hashicorp/vault/sdk/framework" "github.com/hashicorp/vault/sdk/helper/cidrutil" "github.com/hashicorp/vault/sdk/helper/jsonutil" diff --git a/builtin/credential/aws/pkcs7/LICENSE b/helper/pkcs7/LICENSE similarity index 100% rename from builtin/credential/aws/pkcs7/LICENSE rename to helper/pkcs7/LICENSE diff --git a/builtin/credential/aws/pkcs7/README.md b/helper/pkcs7/README.md similarity index 100% rename from builtin/credential/aws/pkcs7/README.md rename to helper/pkcs7/README.md diff --git a/builtin/credential/aws/pkcs7/ber.go b/helper/pkcs7/ber.go similarity index 100% rename from builtin/credential/aws/pkcs7/ber.go rename to helper/pkcs7/ber.go diff --git a/builtin/credential/aws/pkcs7/ber_test.go b/helper/pkcs7/ber_test.go similarity index 100% rename from builtin/credential/aws/pkcs7/ber_test.go rename to helper/pkcs7/ber_test.go diff --git a/builtin/credential/aws/pkcs7/decrypt.go b/helper/pkcs7/decrypt.go similarity index 100% rename from builtin/credential/aws/pkcs7/decrypt.go rename to helper/pkcs7/decrypt.go diff --git a/builtin/credential/aws/pkcs7/decrypt_test.go b/helper/pkcs7/decrypt_test.go similarity index 100% rename from builtin/credential/aws/pkcs7/decrypt_test.go rename to helper/pkcs7/decrypt_test.go diff --git a/builtin/credential/aws/pkcs7/encrypt.go b/helper/pkcs7/encrypt.go similarity index 100% rename from builtin/credential/aws/pkcs7/encrypt.go rename to helper/pkcs7/encrypt.go diff --git a/builtin/credential/aws/pkcs7/encrypt_test.go b/helper/pkcs7/encrypt_test.go similarity index 100% rename from builtin/credential/aws/pkcs7/encrypt_test.go rename to helper/pkcs7/encrypt_test.go diff --git a/builtin/credential/aws/pkcs7/pkcs7.go b/helper/pkcs7/pkcs7.go similarity index 100% rename from builtin/credential/aws/pkcs7/pkcs7.go rename to helper/pkcs7/pkcs7.go diff --git a/builtin/credential/aws/pkcs7/pkcs7_test.go b/helper/pkcs7/pkcs7_test.go similarity index 100% rename from builtin/credential/aws/pkcs7/pkcs7_test.go rename to helper/pkcs7/pkcs7_test.go diff --git a/builtin/credential/aws/pkcs7/sign.go b/helper/pkcs7/sign.go similarity index 100% rename from builtin/credential/aws/pkcs7/sign.go rename to helper/pkcs7/sign.go diff --git a/builtin/credential/aws/pkcs7/sign_test.go b/helper/pkcs7/sign_test.go similarity index 100% rename from builtin/credential/aws/pkcs7/sign_test.go rename to helper/pkcs7/sign_test.go diff --git a/builtin/credential/aws/pkcs7/verify.go b/helper/pkcs7/verify.go similarity index 100% rename from builtin/credential/aws/pkcs7/verify.go rename to helper/pkcs7/verify.go